Skip to content

Commit

Permalink
fix GitHub actions (#1)
Browse files Browse the repository at this point in the history
Co-authored-by: ordonez <[email protected]>
  • Loading branch information
JavierGOrdonnez and ordonez authored Aug 28, 2024
1 parent 3b9395d commit 7cf2098
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 22 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/build-test-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ jobs:
make info-build
- name: test
run: make tests
- if: github.event_name == 'push' && github.ref == 'refs/heads/master'
name: push
run: |
./.github/dockerhub_login.bash
make push
- if: github.event_name == 'push' && github.ref != 'refs/heads/master'
name: push
run: |
./.github/dockerhub_login.bash
make push-version
# - if: github.event_name == 'push' && github.ref == 'refs/heads/master'
# name: push
# run: |
# ./.github/dockerhub_login.bash
# make push
# - if: github.event_name == 'push' && github.ref != 'refs/heads/master'
# name: push
# run: |
# ./.github/dockerhub_login.bash
# make push-version
2 changes: 1 addition & 1 deletion .osparc/bin/ooil
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ run() {
--pull=always \
--volume="/etc/group:/etc/group:ro" \
--volume="/etc/passwd:/etc/passwd:ro" \
--user="$(id --user "$USER")":"$(id --group "$USER")" \
--user root \
--volume "$WORKDIR":/src \
--workdir=/src \
"$IMAGE_NAME" \
Expand Down
11 changes: 4 additions & 7 deletions .osparc/metadata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,20 @@ name: VTK Converter
key: simcore/services/comp/vtk-converter
type: computational
integration-version: 1.0.0
version: 0.1.0
version: 0.1.1
description: Module to convert .vtk files to their .stl and .oents
contact: [email protected]
thumbnail: https://github.com/ITISFoundation/osparc-assets/blob/cb43207b6be2f4311c93cd963538d5718b41a023/assets/default-thumbnail-cookiecutter-osparc-service.png?raw=true
authors:
- name: Shailesh Appukuttan
email: [email protected]
affiliation: INT, Aix-Marseille University, France
- name: Shailesh Appukuttan
email: [email protected]
affiliation: INT, Aix-Marseille University, France
inputs:
input_1:
displayOrder: 1
label: source .vtk file
description: vtk file to be converted
type: data:*/*

outputs:
output_1:
displayOrder: 1
Expand All @@ -32,5 +31,3 @@ outputs:
type: data:*/*
fileToKeyMap:
scaffold.stl: output_2


1 change: 0 additions & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
0.1.0
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
io.simcore.description: '{"description":"Module to convert .vtk files to their
.stl and .oents"}'
io.simcore.key: '{"key":"simcore/services/comp/vtk-converter"}'
io.simcore.version: '{"version":"0.1.0"}'
io.simcore.version: '{"version":"0.1.1"}'
io.simcore.integration-version: '{"integration-version":"1.0.0"}'
io.simcore.type: '{"type":"computational"}'
io.simcore.authors: '{"authors":[{"name":"Shailesh Appukuttan","email":"[email protected]","affiliation":"INT,
Expand All @@ -21,11 +21,11 @@ services:
io.simcore.outputs: '{"outputs":{"output_1":{"displayOrder":1.0,"label":".obj
file","description":"Converted .obj file","type":"data:*/*","fileToKeyMap":{"scaffold.obj":"output_1"}},"output_2":{"displayOrder":2.0,"label":".stl
file","description":"Converted .stl file","type":"data:*/*","fileToKeyMap":{"scaffold.stl":"output_2"}}}}'
org.label-schema.build-date: 2024-08-12T19:47:21+0000
org.label-schema.build-date: 2024-08-22T09:27:02+0000
org.label-schema.schema-version: '1.0'
org.label-schema.vcs-ref: ''
org.label-schema.vcs-url: ''
simcore.service.restart-policy: no-restart
simcore.service.settings: '[{"name":"Resources","type":"Resources","value":{"Limits":{"NanoCPUs":1000000000,"MemoryBytes":2147483648}}}]'
target: production
image: simcore/services/comp/vtk-converter:0.1.0
image: simcore/services/comp/vtk-converter:0.1.1

0 comments on commit 7cf2098

Please sign in to comment.