From a9806c0461468a6bfc508a057b278953f3f91880 Mon Sep 17 00:00:00 2001 From: Alastair Lyall Date: Thu, 1 Aug 2024 15:27:19 +0200 Subject: [PATCH 1/2] feat(tests): add gherkin test files to reana specifications (#73) For compatibility with `reana-client test`. --- AUTHORS.md | 1 + reana-cwl.yaml | 5 +++++ reana-snakemake.yaml | 5 +++++ reana-yadage.yaml | 5 +++++ reana.yaml | 5 +++++ 5 files changed, 21 insertions(+) diff --git a/AUTHORS.md b/AUTHORS.md index db97320..015b9fe 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -2,6 +2,7 @@ The list of contributors in alphabetical order: +- [Alastair Lyall](https://orcid.org/0009-0000-4955-8935) - [Ana Trisovic](https://orcid.org/0000-0003-1991-0533) - [Anton Khodak](https://orcid.org/0000-0003-3263-4553) - [Audrius Mecionis](https://orcid.org/0000-0002-3759-1663) diff --git a/reana-cwl.yaml b/reana-cwl.yaml index 5f99f90..88204c8 100644 --- a/reana-cwl.yaml +++ b/reana-cwl.yaml @@ -13,3 +13,8 @@ workflow: outputs: files: - outputs/plot.png +tests: + files: + - tests/cwl/log-messages.feature + - tests/cwl/run-duration.feature + - tests/cwl/workspace-files.feature diff --git a/reana-snakemake.yaml b/reana-snakemake.yaml index e9b7b26..35522a0 100644 --- a/reana-snakemake.yaml +++ b/reana-snakemake.yaml @@ -13,3 +13,8 @@ workflow: outputs: files: - results/plot.png +tests: + files: + - tests/snakemake/log-messages.feature + - tests/snakemake/run-duration.feature + - tests/snakemake/workspace-files.feature diff --git a/reana-yadage.yaml b/reana-yadage.yaml index bdf91d7..8b6a790 100644 --- a/reana-yadage.yaml +++ b/reana-yadage.yaml @@ -15,3 +15,8 @@ workflow: outputs: files: - fitdata/plot.png +tests: + files: + - tests/yadage/log-messages.feature + - tests/yadage/run-duration.feature + - tests/yadage/workspace-files.feature diff --git a/reana.yaml b/reana.yaml index e06cbbb..a6a7f2c 100644 --- a/reana.yaml +++ b/reana.yaml @@ -24,3 +24,8 @@ workflow: outputs: files: - results/plot.png +tests: + files: + - tests/serial/log-messages.feature + - tests/serial/run-duration.feature + - tests/serial/workspace-files.feature From d88f8ce6ae729fe16d73df93cd1c772bce3d3451 Mon Sep 17 00:00:00 2001 From: Marco Donadoni Date: Wed, 18 Sep 2024 16:59:00 +0200 Subject: [PATCH 2/2] ci(snakemake-local-run): upgrade ROOT dependency (#73) --- .github/workflows/ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f89c6c..836e10d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -127,10 +127,16 @@ jobs: uses: reanahub/reana-github-actions/local-run@v1 with: commands: | + # Install ROOT dependencies + sudo apt-get update -y + sudo apt-get install binutils cmake dpkg-dev g++ gcc libssl-dev git libx11-dev libxext-dev libxft-dev libxpm-dev python3 libtbb-dev libvdt-dev libgif-dev + # Install ROOT - wget https://root.cern/download/root_v6.24.02.Linux-ubuntu20-x86_64-gcc9.3.tar.gz - tar -xzvf root_v6.24.02.Linux-ubuntu20-x86_64-gcc9.3.tar.gz + # ROOT is needed as Snakemake does not run the workflow steps in containers + wget -q https://root.cern/download/root_v6.32.04.Linux-ubuntu24.04-x86_64-gcc13.2.tar.gz + tar xfz root_v6.32.04.Linux-ubuntu24.04-x86_64-gcc13.2.tar.gz source root/bin/thisroot.sh + rm -rf snakemake-local-run && mkdir -p snakemake-local-run && cd snakemake-local-run pip install 'pulp<2.8' snakemake cp -a ../code .