From 7cf20985e396d8adf258e4fc8f63f459038470b5 Mon Sep 17 00:00:00 2001 From: Javier Garcia Ordonez <56032114+JavierGOrdonnez@users.noreply.github.com> Date: Wed, 28 Aug 2024 09:57:10 +0200 Subject: [PATCH] fix GitHub actions (#1) Co-authored-by: ordonez --- .github/workflows/build-test-publish.yml | 20 ++++++++++---------- .osparc/bin/ooil | 2 +- .osparc/metadata.yml | 11 ++++------- VERSION | 1 - docker-compose.yml | 6 +++--- 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index 294fa5c..8c0a611 100644 --- a/.github/workflows/build-test-publish.yml +++ b/.github/workflows/build-test-publish.yml @@ -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 diff --git a/.osparc/bin/ooil b/.osparc/bin/ooil index fb85469..009af8f 100755 --- a/.osparc/bin/ooil +++ b/.osparc/bin/ooil @@ -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" \ diff --git a/.osparc/metadata.yml b/.osparc/metadata.yml index caddea4..7513f5d 100644 --- a/.osparc/metadata.yml +++ b/.osparc/metadata.yml @@ -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: appukuttan.shailesh@gmail.com thumbnail: https://github.com/ITISFoundation/osparc-assets/blob/cb43207b6be2f4311c93cd963538d5718b41a023/assets/default-thumbnail-cookiecutter-osparc-service.png?raw=true authors: - - name: Shailesh Appukuttan - email: appukuttan.shailesh@gmail.com - affiliation: INT, Aix-Marseille University, France +- name: Shailesh Appukuttan + email: appukuttan.shailesh@gmail.com + 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 @@ -32,5 +31,3 @@ outputs: type: data:*/* fileToKeyMap: scaffold.stl: output_2 - - diff --git a/VERSION b/VERSION index 6c6aa7c..e69de29 100644 --- a/VERSION +++ b/VERSION @@ -1 +0,0 @@ -0.1.0 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index d62993a..cd296e7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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":"appukuttan.shailesh@gmail.com","affiliation":"INT, @@ -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