From 08b3824b0a58aacae94424efec29edadf1b55093 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Wed, 28 Feb 2024 09:37:13 +0100 Subject: [PATCH 01/18] Add SQA Action --- .github/workflows/sqaaas.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sqaaas.yaml b/.github/workflows/sqaaas.yaml index 157f5072..5850554f 100644 --- a/.github/workflows/sqaaas.yaml +++ b/.github/workflows/sqaaas.yaml @@ -9,5 +9,6 @@ jobs: sqaaas_job: runs-on: ubuntu-latest steps: - - uses: eosc-synergy/sqaaas-assessment-action@v2 + - name: SQAaaS assessment step + uses: eosc-synergy/sqaaas-assessment-action@v2 From 5715d1a7224299db56bd7ab6af4f87b0cf89f061 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Tue, 5 Mar 2024 12:09:58 +0100 Subject: [PATCH 02/18] Add tox step --- .github/workflows/sqaaas.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/sqaaas.yaml b/.github/workflows/sqaaas.yaml index 5850554f..4264a9c1 100644 --- a/.github/workflows/sqaaas.yaml +++ b/.github/workflows/sqaaas.yaml @@ -9,6 +9,19 @@ jobs: sqaaas_job: runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@v3 + repository: 'https://github.com/EOSC-synergy/sqaaas-step-action/' + path: 'sqaaas-step-action' + + - name: Tox unit test step definition for a SQAaaS assessment + uses: ./sqaaas-step-action + id: tox_unit_test + with: + name: tox_unit_test + tool: tox + - name: SQAaaS assessment step uses: eosc-synergy/sqaaas-assessment-action@v2 + From 8a778021458acb8ae607971080473f3d3a17b6f7 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Tue, 5 Mar 2024 12:12:05 +0100 Subject: [PATCH 03/18] Add tox step --- .github/workflows/sqaaas.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sqaaas.yaml b/.github/workflows/sqaaas.yaml index 4264a9c1..bd109d78 100644 --- a/.github/workflows/sqaaas.yaml +++ b/.github/workflows/sqaaas.yaml @@ -11,8 +11,9 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - repository: 'https://github.com/EOSC-synergy/sqaaas-step-action/' - path: 'sqaaas-step-action' + with: + repository: 'https://github.com/EOSC-synergy/sqaaas-step-action/' + path: 'sqaaas-step-action' - name: Tox unit test step definition for a SQAaaS assessment uses: ./sqaaas-step-action @@ -23,5 +24,7 @@ jobs: - name: SQAaaS assessment step uses: eosc-synergy/sqaaas-assessment-action@v2 + with: + qc_uni_steps: tox_unit_test From 0ca164c554d9349aca6da5a9c9721ba44f5d8b97 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Tue, 5 Mar 2024 12:13:26 +0100 Subject: [PATCH 04/18] Add tox step --- .github/workflows/sqaaas.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sqaaas.yaml b/.github/workflows/sqaaas.yaml index bd109d78..6f72269c 100644 --- a/.github/workflows/sqaaas.yaml +++ b/.github/workflows/sqaaas.yaml @@ -12,7 +12,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 with: - repository: 'https://github.com/EOSC-synergy/sqaaas-step-action/' + repository: 'EOSC-synergy/sqaaas-step-action/' path: 'sqaaas-step-action' - name: Tox unit test step definition for a SQAaaS assessment From 6c40946959062f1fc0518dacbd54b834102638c6 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Tue, 5 Mar 2024 12:13:59 +0100 Subject: [PATCH 05/18] Add tox step --- .github/workflows/sqaaas.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sqaaas.yaml b/.github/workflows/sqaaas.yaml index 6f72269c..a780b3d9 100644 --- a/.github/workflows/sqaaas.yaml +++ b/.github/workflows/sqaaas.yaml @@ -12,7 +12,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 with: - repository: 'EOSC-synergy/sqaaas-step-action/' + repository: 'EOSC-synergy/sqaaas-step-action' path: 'sqaaas-step-action' - name: Tox unit test step definition for a SQAaaS assessment From ca8982467ba7ef2350eb1084ea3d4cbdfd900f7f Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Tue, 5 Mar 2024 12:17:59 +0100 Subject: [PATCH 06/18] Add tox step --- .github/workflows/sqaaas.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sqaaas.yaml b/.github/workflows/sqaaas.yaml index a780b3d9..147f072b 100644 --- a/.github/workflows/sqaaas.yaml +++ b/.github/workflows/sqaaas.yaml @@ -20,7 +20,8 @@ jobs: id: tox_unit_test with: name: tox_unit_test - tool: tox + tool: commands + commands: tox -e py3 - name: SQAaaS assessment step uses: eosc-synergy/sqaaas-assessment-action@v2 From 8ef7badd8bab830343bfde1dcecb1febad8a5d0c Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Tue, 5 Mar 2024 12:35:46 +0100 Subject: [PATCH 07/18] Add image to tox step --- .github/workflows/sqaaas.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sqaaas.yaml b/.github/workflows/sqaaas.yaml index 147f072b..15830fac 100644 --- a/.github/workflows/sqaaas.yaml +++ b/.github/workflows/sqaaas.yaml @@ -19,6 +19,7 @@ jobs: uses: ./sqaaas-step-action id: tox_unit_test with: + container: "grycap/tox" name: tox_unit_test tool: commands commands: tox -e py3 From 9e652e096760fd8974071140e460d1b77d479df1 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Tue, 5 Mar 2024 12:45:42 +0100 Subject: [PATCH 08/18] install tox --- .github/workflows/sqaaas.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sqaaas.yaml b/.github/workflows/sqaaas.yaml index 15830fac..3cec2002 100644 --- a/.github/workflows/sqaaas.yaml +++ b/.github/workflows/sqaaas.yaml @@ -19,10 +19,11 @@ jobs: uses: ./sqaaas-step-action id: tox_unit_test with: - container: "grycap/tox" name: tox_unit_test tool: commands - commands: tox -e py3 + commands: | + pip install tox + tox -e py3 - name: SQAaaS assessment step uses: eosc-synergy/sqaaas-assessment-action@v2 From dcccb544c6f5a197a1a1f319caaf3290a00017f7 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Tue, 5 Mar 2024 12:58:17 +0100 Subject: [PATCH 09/18] install tox --- .github/workflows/sqaaas.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sqaaas.yaml b/.github/workflows/sqaaas.yaml index 3cec2002..86207217 100644 --- a/.github/workflows/sqaaas.yaml +++ b/.github/workflows/sqaaas.yaml @@ -19,11 +19,10 @@ jobs: uses: ./sqaaas-step-action id: tox_unit_test with: + container: "python:3.10" name: tox_unit_test tool: commands - commands: | - pip install tox - tox -e py3 + commands: pip install tox && tox -e py3 - name: SQAaaS assessment step uses: eosc-synergy/sqaaas-assessment-action@v2 From b872a11e8cb670891020c4b18f29cc1ef66ac4e0 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Tue, 5 Mar 2024 13:35:17 +0100 Subject: [PATCH 10/18] Usa mamba --- .github/workflows/sqaaas.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sqaaas.yaml b/.github/workflows/sqaaas.yaml index 86207217..9d7b9272 100644 --- a/.github/workflows/sqaaas.yaml +++ b/.github/workflows/sqaaas.yaml @@ -9,20 +9,22 @@ jobs: sqaaas_job: runs-on: ubuntu-latest steps: - - name: Checkout + - name: Checkout SQAaaS step action uses: actions/checkout@v3 with: repository: 'EOSC-synergy/sqaaas-step-action' path: 'sqaaas-step-action' - - name: Tox unit test step definition for a SQAaaS assessment + - name: Add tox unit test step definition for a SQAaaS assessment uses: ./sqaaas-step-action id: tox_unit_test with: - container: "python:3.10" name: tox_unit_test tool: commands - commands: pip install tox && tox -e py3 + commands: | + micromamba install -c conda-forge python=3.10 tox -y + micromamba activate base + tox -e py3 - name: SQAaaS assessment step uses: eosc-synergy/sqaaas-assessment-action@v2 From f69aa28956ec46ca9e96c54947ef9890040bfd4b Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Tue, 5 Mar 2024 14:08:25 +0100 Subject: [PATCH 11/18] Usa mamba --- .github/workflows/sqaaas.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sqaaas.yaml b/.github/workflows/sqaaas.yaml index 9d7b9272..821b7501 100644 --- a/.github/workflows/sqaaas.yaml +++ b/.github/workflows/sqaaas.yaml @@ -3,7 +3,8 @@ name: SQAaaS IM on: push: branches: ["sqa"] - + tags: + - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 jobs: sqaaas_job: @@ -19,12 +20,14 @@ jobs: uses: ./sqaaas-step-action id: tox_unit_test with: +# container: "python:3.10" name: tox_unit_test tool: commands +# commands: pip install tox && tox -e py3 commands: | - micromamba install -c conda-forge python=3.10 tox -y - micromamba activate base - tox -e py3 + micromamba create -n test + micromamba install -n test -c conda-forge python=3.10 tox -y + micromamba run -n test tox -e py3 - name: SQAaaS assessment step uses: eosc-synergy/sqaaas-assessment-action@v2 From da80eba762288fbff78a1f1e52e78c646c16b5c3 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Wed, 6 Mar 2024 12:47:36 +0100 Subject: [PATCH 12/18] Remove clone --- .github/workflows/sqaaas.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/sqaaas.yaml b/.github/workflows/sqaaas.yaml index 821b7501..6e72d9ad 100644 --- a/.github/workflows/sqaaas.yaml +++ b/.github/workflows/sqaaas.yaml @@ -10,14 +10,8 @@ jobs: sqaaas_job: runs-on: ubuntu-latest steps: - - name: Checkout SQAaaS step action - uses: actions/checkout@v3 - with: - repository: 'EOSC-synergy/sqaaas-step-action' - path: 'sqaaas-step-action' - - name: Add tox unit test step definition for a SQAaaS assessment - uses: ./sqaaas-step-action + uses: eosc-synergy/sqaaas-step-action@v1 id: tox_unit_test with: # container: "python:3.10" From b1cf0d56b51a18e60290021cbce118eebe01331f Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Mon, 11 Mar 2024 07:34:46 +0100 Subject: [PATCH 13/18] use tox in test --- .github/workflows/sqaaas.yaml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/sqaaas.yaml b/.github/workflows/sqaaas.yaml index 6e72d9ad..44057618 100644 --- a/.github/workflows/sqaaas.yaml +++ b/.github/workflows/sqaaas.yaml @@ -14,14 +14,9 @@ jobs: uses: eosc-synergy/sqaaas-step-action@v1 id: tox_unit_test with: -# container: "python:3.10" - name: tox_unit_test - tool: commands -# commands: pip install tox && tox -e py3 - commands: | - micromamba create -n test - micromamba install -n test -c conda-forge python=3.10 tox -y - micromamba run -n test tox -e py3 + name: test-unit-step + tool: tox + tox_env: py3 - name: SQAaaS assessment step uses: eosc-synergy/sqaaas-assessment-action@v2 From 736df01a23c618e3ce718d38eabd1f7df64e86a3 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Mon, 11 Mar 2024 07:37:10 +0100 Subject: [PATCH 14/18] use tox in test --- .github/workflows/sqaaas.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sqaaas.yaml b/.github/workflows/sqaaas.yaml index 44057618..afd1a2ce 100644 --- a/.github/workflows/sqaaas.yaml +++ b/.github/workflows/sqaaas.yaml @@ -14,7 +14,7 @@ jobs: uses: eosc-synergy/sqaaas-step-action@v1 id: tox_unit_test with: - name: test-unit-step + name: tox_unit_test tool: tox tox_env: py3 From 931f07d6abf8da431d4b5ad380c6d3df8e048029 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Mon, 11 Mar 2024 07:45:38 +0100 Subject: [PATCH 15/18] use tox in test --- .github/workflows/sqaaas.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/sqaaas.yaml b/.github/workflows/sqaaas.yaml index afd1a2ce..7c8c3bc4 100644 --- a/.github/workflows/sqaaas.yaml +++ b/.github/workflows/sqaaas.yaml @@ -17,6 +17,9 @@ jobs: name: tox_unit_test tool: tox tox_env: py3 +# container: "python:3.10" +# tool: commands +# commands: pip install tox && tox -e py3 - name: SQAaaS assessment step uses: eosc-synergy/sqaaas-assessment-action@v2 From 9ef24afc0161de8cd104feb9c8643c66c7214fca Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Mon, 11 Mar 2024 07:55:36 +0100 Subject: [PATCH 16/18] use command in test --- .github/workflows/sqaaas.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sqaaas.yaml b/.github/workflows/sqaaas.yaml index 7c8c3bc4..55a96cc6 100644 --- a/.github/workflows/sqaaas.yaml +++ b/.github/workflows/sqaaas.yaml @@ -15,11 +15,11 @@ jobs: id: tox_unit_test with: name: tox_unit_test - tool: tox - tox_env: py3 -# container: "python:3.10" -# tool: commands -# commands: pip install tox && tox -e py3 +# tool: tox +# tox_env: py3 + container: "python:3.10" + tool: commands + commands: pip install tox && tox -e py3 - name: SQAaaS assessment step uses: eosc-synergy/sqaaas-assessment-action@v2 From 60df4ce8dd6f6287c7a3819e4355419d33144c74 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Mon, 11 Mar 2024 07:59:51 +0100 Subject: [PATCH 17/18] Git clone action --- .github/workflows/sqaaas.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/sqaaas.yaml b/.github/workflows/sqaaas.yaml index 55a96cc6..c72e5848 100644 --- a/.github/workflows/sqaaas.yaml +++ b/.github/workflows/sqaaas.yaml @@ -10,16 +10,19 @@ jobs: sqaaas_job: runs-on: ubuntu-latest steps: + - name: Checkout SQAaaS step action + uses: actions/checkout@v3 + with: + repository: 'EOSC-synergy/sqaaas-step-action' + path: 'sqaaas-step-action' + - name: Add tox unit test step definition for a SQAaaS assessment - uses: eosc-synergy/sqaaas-step-action@v1 + uses: ./sqaaas-step-action id: tox_unit_test with: name: tox_unit_test -# tool: tox -# tox_env: py3 - container: "python:3.10" - tool: commands - commands: pip install tox && tox -e py3 + tool: tox + tox_env: py3 - name: SQAaaS assessment step uses: eosc-synergy/sqaaas-assessment-action@v2 From 2ac1486c6616c8fe495ff40bc62ce3d790b7df7d Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Mon, 11 Mar 2024 08:02:06 +0100 Subject: [PATCH 18/18] use tox in test --- .github/workflows/sqaaas.yaml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/sqaaas.yaml b/.github/workflows/sqaaas.yaml index c72e5848..7131f522 100644 --- a/.github/workflows/sqaaas.yaml +++ b/.github/workflows/sqaaas.yaml @@ -10,23 +10,18 @@ jobs: sqaaas_job: runs-on: ubuntu-latest steps: - - name: Checkout SQAaaS step action - uses: actions/checkout@v3 - with: - repository: 'EOSC-synergy/sqaaas-step-action' - path: 'sqaaas-step-action' - - name: Add tox unit test step definition for a SQAaaS assessment - uses: ./sqaaas-step-action + uses: eosc-synergy/sqaaas-step-action@v1 id: tox_unit_test with: name: tox_unit_test tool: tox tox_env: py3 +# container: "python:3.10" +# tool: commands +# commands: pip install tox && tox -e py3 - name: SQAaaS assessment step uses: eosc-synergy/sqaaas-assessment-action@v2 with: qc_uni_steps: tox_unit_test - -