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/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..3ef7f66 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,31 @@ +on: + push: + branches: + - master + pull_request: + + +jobs: + call-test-workflow: + uses: ITISFoundation/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-patch 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/.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 56eea9b..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 @@ -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),,$@)" diff --git a/docker-compose-local.yml b/docker-compose-local.yml index 7e7a075..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: @@ -8,9 +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=10.43.103.149.nip.io:8006 - - OSPARC_API_KEY=test_T1QyAxKBUX - - OSPARC_API_SECRET=0dsHA6zdYDNEtwNKsXZHBQq8eHuPbd + - OSPARC_API_HOST= + - OSPARC_API_KEY= + - OSPARC_API_SECRET= volumes: - /tmp/.X11-unix:/tmp/.X11-unix - ${PWD}/validation-tmp/workspace:/home/osparcuser/work/workspace