Skip to content

Commit

Permalink
Update infra (#75)
Browse files Browse the repository at this point in the history
* bump actions/checkout to v4

* use branch

* remove local copy of files from omero-test-infra

* rename folder

* exclude .DS_Store

* change permissions

* split test

* do no upack if plate or screen

* using submodules

* set python version

* bump actions/checkout to v4

* use ome branch

* bumping python to 3.9, new omero-test-infra

* run the tests for plate and screen

* use own branch

* pass parameter

* remove customised file

* combine tests

* use ome repository

---------

Co-authored-by: Erick Martins Ratamero <erickmartins@gmx.net>
  • Loading branch information
jburel and erickmartins authored Jan 23, 2024
1 parent 760b789 commit 009504b
Show file tree
Hide file tree
Showing 36 changed files with 30 additions and 943 deletions.
17 changes: 8 additions & 9 deletions .github/workflows/omero_plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,12 @@ jobs:
env:
STAGE: cli
steps:
- uses: actions/checkout@v3
#- name: Checkout omero-test-infra
# uses: actions/checkout@master
# with:
# repository: ome/omero-test-infra
# path: .omero
# ref: ${{ secrets.OMERO_TEST_INFRA_REF }}
- uses: actions/checkout@v4
- name: Checkout omero-test-infra
uses: actions/checkout@master
with:
repository: ome/omero-test-infra
path: .omero
ref: ${{ secrets.OMERO_TEST_INFRA_REF }}
- name: Build and run OMERO tests
# run: .omero/docker $STAGE
run: sudo chmod +x .omero/* && .omero/docker $STAGE
run: POLICY_BINARY_ACCESS=+read,+write,+image,+plate .omero/docker $STAGE
4 changes: 3 additions & 1 deletion .github/workflows/upload_to_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.9'
- name: Install Tools
run: |
python -mpip install wheel
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/upload_to_test_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.9'
- name: Install Tools
run: |
python -mpip install wheel
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,5 @@ dmypy.json

# vs code settings
.vscode/

.DS_Store
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule ".omero"]
path = .omero
url = https://github.com/ome/omero-test-infra
1 change: 1 addition & 0 deletions .omero
Submodule .omero added at 421c3a
16 changes: 0 additions & 16 deletions .omero/.env

This file was deleted.

202 changes: 0 additions & 202 deletions .omero/README.md

This file was deleted.

20 changes: 0 additions & 20 deletions .omero/app-build

This file was deleted.

12 changes: 0 additions & 12 deletions .omero/app-config

This file was deleted.

2 changes: 0 additions & 2 deletions .omero/app-docker

This file was deleted.

6 changes: 0 additions & 6 deletions .omero/cli-docker

This file was deleted.

12 changes: 0 additions & 12 deletions .omero/compose

This file was deleted.

Loading

0 comments on commit 009504b

Please sign in to comment.