From f241d3de6075b1a741301f616f876ce050647cdf Mon Sep 17 00:00:00 2001 From: ordonez Date: Tue, 20 Aug 2024 16:15:35 +0200 Subject: [PATCH 1/3] fixing GitHub actions --- .osparc/bin/ooil | 2 +- .osparc/metadata.yml | 2 +- VERSION | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 0f26e1d..3b940b7 100644 --- a/.osparc/metadata.yml +++ b/.osparc/metadata.yml @@ -2,7 +2,7 @@ name: File Format Converter key: simcore/services/comp/file-format-converter type: computational integration-version: 1.0.0 -version: 0.1.0 +version: 0.1.1 description: Module to allow conversion of files between various formats such as CSV, JSON, YAML, XLS, XLSX, NWB contact: appukuttan.shailesh@gmail.com thumbnail: https://github.com/ITISFoundation/osparc-assets/blob/cb43207b6be2f4311c93cd963538d5718b41a023/assets/default-thumbnail-cookiecutter-osparc-service.png?raw=true diff --git a/VERSION b/VERSION index 6c6aa7c..6da28dd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.0 \ No newline at end of file +0.1.1 \ No newline at end of file From 5b0fd6a41abe7fe76b44bf5b25cd112d241b18c6 Mon Sep 17 00:00:00 2001 From: ordonez Date: Tue, 20 Aug 2024 16:37:32 +0200 Subject: [PATCH 2/3] fixing make test --- docker-compose.yml | 6 +++--- validation/output/outputs.json | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 validation/output/outputs.json diff --git a/docker-compose.yml b/docker-compose.yml index 8a1abe6..bd5f251 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: io.simcore.description: '{"description":"Module to allow conversion of files between various formats such as CSV, JSON, YAML, XLS, XLSX, NWB"}' io.simcore.key: '{"key":"simcore/services/comp/file-format-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: format","description":"required format of the output file","type":"ref_contentSchema","contentSchema":{"title":"target_format","default":"json","enum":["csv","json","yaml","xls","xlsx","nwb","parquet","feather","pkl","xml","toml","h5","hdf5"]}}}}' io.simcore.outputs: '{"outputs":{"output_1":{"displayOrder":1.0,"label":"converted file","description":"path to the converted file","type":"data:*/*","fileToKeyMap":{"output.zip":"output_1"}}}}' - org.label-schema.build-date: 2024-08-12T07:47:35+0000 + org.label-schema.build-date: 2024-08-20T14:31:12+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/file-format-converter:0.1.0 + image: simcore/services/comp/file-format-converter:0.1.1 diff --git a/validation/output/outputs.json b/validation/output/outputs.json new file mode 100644 index 0000000..0c63d94 --- /dev/null +++ b/validation/output/outputs.json @@ -0,0 +1,3 @@ +{ + "output_1": "some_stuff" +} \ No newline at end of file From fa289e8269675d6a1e37cbf8946831bf398251eb Mon Sep 17 00:00:00 2001 From: ordonez Date: Tue, 20 Aug 2024 16:48:13 +0200 Subject: [PATCH 3/3] remove push from CI --- .github/workflows/build-test-publish.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index ab26533..0456ef2 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