From 213e70a6c747020c33e61abdbcfc893cd20469de Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Fri, 1 Nov 2024 11:17:51 +0100 Subject: [PATCH 1/7] Testing autodeploy --- .github/workflows/deploy.yml | 29 +++++++++++++++++++++++++++++ .github/workflows/test.yml | 6 +----- docker-compose-local.yml | 3 --- 3 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..8fa955a --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,29 @@ +on: + push: + branches: + - master + + +jobs: + call-test-workflow: + uses: wvangeit/osparc-meta-parallelrunner/.github/workflows/test.yml@master + newversion: + name: make new version + runs-on: ubuntu-latest + needs: + call-test-workflow + permissions: + contents: write + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: 3.11 + # - name: Install dependencies + # run: python -m pip install --upgrade pip setuptools build + - name: Make new version + run: + make version-path diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9ee937e..9afdbac 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,11 +2,8 @@ name: Test on: pull_request: - push: - branches: - - master workflow_call: - + jobs: test: name: Test for python ${{ matrix.python-version }} on ${{ matrix.os }} @@ -31,4 +28,3 @@ jobs: run: make build - name: Make run-local run: make run-local - diff --git a/docker-compose-local.yml b/docker-compose-local.yml index 7e7a075..d89c874 100755 --- a/docker-compose-local.yml +++ b/docker-compose-local.yml @@ -8,9 +8,6 @@ services: - DY_SIDECAR_PATH_OUTPUTS=/tmp/outputs - DY_BOOT_OPTION_BOOT_MODE=0 - DY_SIDECAR_PATH=/home/osparcuser/work/workspace - - OSPARC_API_HOST=10.43.103.149.nip.io:8006 - - OSPARC_API_KEY=test_T1QyAxKBUX - - OSPARC_API_SECRET=0dsHA6zdYDNEtwNKsXZHBQq8eHuPbd volumes: - /tmp/.X11-unix:/tmp/.X11-unix - ${PWD}/validation-tmp/workspace:/home/osparcuser/work/workspace From 654913a809cc9b578d2e126bdc12b2aa8e891e19 Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Fri, 1 Nov 2024 11:23:06 +0100 Subject: [PATCH 2/7] Temporarily run on PR instead of master --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8fa955a..5eca5db 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,6 +2,7 @@ on: push: branches: - master + pull_request: jobs: From 0fa7b27ff85ce9b3359d93b75ce431195cbd6663 Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Fri, 1 Nov 2024 11:27:06 +0100 Subject: [PATCH 3/7] Add empty API vars --- docker-compose-local.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose-local.yml b/docker-compose-local.yml index d89c874..9751659 100755 --- a/docker-compose-local.yml +++ b/docker-compose-local.yml @@ -8,6 +8,9 @@ services: - DY_SIDECAR_PATH_OUTPUTS=/tmp/outputs - DY_BOOT_OPTION_BOOT_MODE=0 - DY_SIDECAR_PATH=/home/osparcuser/work/workspace + - OSPARC_API_HOST= + - OSPARC_API_KEY= + - OSPARC_API_SECRET= volumes: - /tmp/.X11-unix:/tmp/.X11-unix - ${PWD}/validation-tmp/workspace:/home/osparcuser/work/workspace From c43b0edf1b3d7be103c24e8fe214e76f18438563 Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Fri, 1 Nov 2024 11:42:07 +0100 Subject: [PATCH 4/7] Fix deploy yml --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5eca5db..fa078b1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -7,7 +7,7 @@ on: jobs: call-test-workflow: - uses: wvangeit/osparc-meta-parallelrunner/.github/workflows/test.yml@master + uses: ITISFoundation/osparc-meta-parallelrunner/.github/workflows/test.yml@master newversion: name: make new version runs-on: ubuntu-latest From 9df73001e7259c37ae356d9f5f52ffeb463d2f95 Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Fri, 1 Nov 2024 11:48:31 +0100 Subject: [PATCH 5/7] Fix deploy yml --- .github/workflows/deploy.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index fa078b1..3ef7f66 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,7 +8,8 @@ on: jobs: call-test-workflow: uses: ITISFoundation/osparc-meta-parallelrunner/.github/workflows/test.yml@master - newversion: + + newversion: name: make new version runs-on: ubuntu-latest needs: @@ -27,4 +28,4 @@ jobs: # run: python -m pip install --upgrade pip setuptools build - name: Make new version run: - make version-path + make version-patch From 508fe82448004e1ab7cbbd46f06357bee4a2a95e Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Fri, 1 Nov 2024 12:06:24 +0100 Subject: [PATCH 6/7] Remove it from docker run --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 56eea9b..434a71a 100755 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ export LOCAL_REGISTRY ?= registry:5000 define _bumpversion # upgrades as $(subst $(1),,$@) version, commits and tags - @docker run -it --rm -v $(PWD):/${DOCKER_IMAGE_NAME} \ + @docker run --rm -v $(PWD):/${DOCKER_IMAGE_NAME} \ -u $(shell id -u):$(shell id -g) \ itisfoundation/ci-service-integration-library:latest \ sh -c "cd /${DOCKER_IMAGE_NAME} && bump2version --verbose --list --config-file $(1) $(subst $(2),,$@)" From 905be092e0228c13c3cc1703df100aa31d812674 Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Fri, 1 Nov 2024 12:06:37 +0100 Subject: [PATCH 7/7] Bump version --- .bumpversion.cfg | 2 +- .osparc/osparc-meta-parallelrunner/metadata.yml | 2 +- Makefile | 2 +- docker-compose-local.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 6c7323e..7422218 100755 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.1.9 +current_version = 1.1.10 commit = False message = service version: {current_version} → {new_version} tag = False diff --git a/.osparc/osparc-meta-parallelrunner/metadata.yml b/.osparc/osparc-meta-parallelrunner/metadata.yml index 6149a41..a92b5f9 100755 --- a/.osparc/osparc-meta-parallelrunner/metadata.yml +++ b/.osparc/osparc-meta-parallelrunner/metadata.yml @@ -1,7 +1,7 @@ name: ParallelRunner description: "ParallelRunnerService" key: simcore/services/dynamic/osparc-meta-parallelrunner -version: 1.1.9 +version: 1.1.10 integration-version: 2.0.0 type: dynamic authors: diff --git a/Makefile b/Makefile index 434a71a..51f2557 100755 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ SHELL = /bin/sh MAKEFLAGS += -j2 export DOCKER_IMAGE_NAME ?= osparc-meta-parallelrunner -export DOCKER_IMAGE_TAG ?= 1.1.9 +export DOCKER_IMAGE_TAG ?= 1.1.10 export MASTER_AWS_REGISTRY ?= registry.osparc-master-zmt.click export MASTER_REGISTRY ?= registry.osparc-master.speag.com diff --git a/docker-compose-local.yml b/docker-compose-local.yml index 9751659..bf52ce6 100755 --- a/docker-compose-local.yml +++ b/docker-compose-local.yml @@ -1,6 +1,6 @@ services: osparc-meta-parallelrunner: - image: simcore/services/dynamic/osparc-meta-parallelrunner:1.1.9 + image: simcore/services/dynamic/osparc-meta-parallelrunner:1.1.10 ports: - "8888:8888" environment: