Skip to content

Commit

Permalink
Merge pull request #1 from ITISFoundation/work/jgo/fix_github_actions
Browse files Browse the repository at this point in the history
Fix GitHub actions - build & test
  • Loading branch information
JavierGOrdonnez authored Aug 20, 2024
2 parents 01fc9f2 + fa289e8 commit 07e8ec5
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 16 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
2 changes: 1 addition & 1 deletion .osparc/metadata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: [email protected]
thumbnail: https://github.com/ITISFoundation/osparc-assets/blob/cb43207b6be2f4311c93cd963538d5718b41a023/assets/default-thumbnail-cookiecutter-osparc-service.png?raw=true
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.0
0.1.1
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 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":"[email protected]","affiliation":"INT,
Expand All @@ -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
3 changes: 3 additions & 0 deletions validation/output/outputs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"output_1": "some_stuff"
}

0 comments on commit 07e8ec5

Please sign in to comment.