Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test auto deploy #15

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -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
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -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
6 changes: 1 addition & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -31,4 +28,3 @@ jobs:
run: make build
- name: Make run-local
run: make run-local

2 changes: 1 addition & 1 deletion .osparc/osparc-meta-parallelrunner/metadata.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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),,$@)"
Expand Down
8 changes: 4 additions & 4 deletions docker-compose-local.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
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:
- DY_SIDECAR_PATH_INPUTS=/tmp/inputs
- 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
Expand Down
Loading