simplify test actions with gacts/run-and-post-run

DeepPSP · Mar 20, 2024 · a9ee3f3 · a9ee3f3
1 parent 10f4011
commit a9ee3f3
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 28 deletions.
diff --git a/.github/workflows/run-pytest.yml b/.github/workflows/run-pytest.yml
@@ -61,17 +61,22 @@ jobs:
         python -m pip list
     - name: Install nsrr and download a samll part of SHHS to do test
     # ref. https://github.com/DeepPSP/nsrr-automate
-      run: |
-        gem install nsrr --no-document
-        nsrr download shhs/polysomnography/edfs/shhs1/ --file="^shhs1\-20010.*\.edf" --token=${{ secrets.NSRR_TOKEN }}
-        nsrr download shhs/polysomnography/annotations-events-nsrr/shhs1/ --file="^shhs1\-20010.*\-nsrr\.xml" --token=${{ secrets.NSRR_TOKEN }}
-        nsrr download shhs/polysomnography/annotations-events-profusion/shhs1/ --file="^shhs1\-20010.*\-profusion\.xml" --token=${{ secrets.NSRR_TOKEN }}
-        nsrr download shhs/polysomnography/annotations-rpoints/shhs1/ --file="^shhs1\-20010.*\-rpoint\.csv" --token=${{ secrets.NSRR_TOKEN }}
-        nsrr download shhs/datasets/ --shallow --token=${{ secrets.NSRR_TOKEN }}
-        nsrr download shhs/datasets/hrv-analysis/ --token=${{ secrets.NSRR_TOKEN }}
-        mkdir -p ~/tmp/nsrr-data/
-        mv shhs/ ~/tmp/nsrr-data/
-        du -sh ~/tmp/nsrr-data/*
+      uses: gacts/run-and-post-run@v1
+      with:
+        run: |
+          gem install nsrr --no-document
+          nsrr download shhs/polysomnography/edfs/shhs1/ --file="^shhs1\-20010.*\.edf" --token=${{ secrets.NSRR_TOKEN }}
+          nsrr download shhs/polysomnography/annotations-events-nsrr/shhs1/ --file="^shhs1\-20010.*\-nsrr\.xml" --token=${{ secrets.NSRR_TOKEN }}
+          nsrr download shhs/polysomnography/annotations-events-profusion/shhs1/ --file="^shhs1\-20010.*\-profusion\.xml" --token=${{ secrets.NSRR_TOKEN }}
+          nsrr download shhs/polysomnography/annotations-rpoints/shhs1/ --file="^shhs1\-20010.*\-rpoint\.csv" --token=${{ secrets.NSRR_TOKEN }}
+          nsrr download shhs/datasets/ --shallow --token=${{ secrets.NSRR_TOKEN }}
+          nsrr download shhs/datasets/hrv-analysis/ --token=${{ secrets.NSRR_TOKEN }}
+          mkdir -p ~/tmp/nsrr-data/
+          mv shhs/ ~/tmp/nsrr-data/
+          du -sh ~/tmp/nsrr-data/*
+        post: |
+          rm -rf ~/tmp/nsrr-data/
+          du -sh ~/tmp/nsrr-data/*
     - name: Run test with pytest and collect coverage
       run: |
         pytest -v -s \
@@ -85,6 +90,3 @@ jobs:
         fail_ci_if_error: true # optional (default = false)
         verbose: true # optional (default = false)
         token: ${{ secrets.CODECOV_TOKEN }} # required
-    - name: Remove downloaded NSRR data
-      run: |
-        rm -rf ~/tmp/nsrr-data/
diff --git a/.github/workflows/test-databases.yml b/.github/workflows/test-databases.yml
@@ -61,23 +61,25 @@ jobs:
         python -m pip list
     - name: Install nsrr and download a samll part of SHHS to do test
     # ref. https://github.com/DeepPSP/nsrr-automate
-      run: |
-        gem install nsrr --no-document
-        nsrr download shhs/polysomnography/edfs/shhs1/ --file="^shhs1\-20010.*\.edf" --token=${{ secrets.NSRR_TOKEN }}
-        nsrr download shhs/polysomnography/annotations-events-nsrr/shhs1/ --file="^shhs1\-20010.*\-nsrr\.xml" --token=${{ secrets.NSRR_TOKEN }}
-        nsrr download shhs/polysomnography/annotations-events-profusion/shhs1/ --file="^shhs1\-20010.*\-profusion\.xml" --token=${{ secrets.NSRR_TOKEN }}
-        nsrr download shhs/polysomnography/annotations-rpoints/shhs1/ --file="^shhs1\-20010.*\-rpoint\.csv" --token=${{ secrets.NSRR_TOKEN }}
-        nsrr download shhs/datasets/ --shallow --token=${{ secrets.NSRR_TOKEN }}
-        nsrr download shhs/datasets/hrv-analysis/ --token=${{ secrets.NSRR_TOKEN }}
-        mkdir -p ~/tmp/nsrr-data/
-        mv shhs/ ~/tmp/nsrr-data/
-        du -sh ~/tmp/nsrr-data/*
+      uses: gacts/run-and-post-run@v1
+      with:
+        run: |
+          gem install nsrr --no-document
+          nsrr download shhs/polysomnography/edfs/shhs1/ --file="^shhs1\-20010.*\.edf" --token=${{ secrets.NSRR_TOKEN }}
+          nsrr download shhs/polysomnography/annotations-events-nsrr/shhs1/ --file="^shhs1\-20010.*\-nsrr\.xml" --token=${{ secrets.NSRR_TOKEN }}
+          nsrr download shhs/polysomnography/annotations-events-profusion/shhs1/ --file="^shhs1\-20010.*\-profusion\.xml" --token=${{ secrets.NSRR_TOKEN }}
+          nsrr download shhs/polysomnography/annotations-rpoints/shhs1/ --file="^shhs1\-20010.*\-rpoint\.csv" --token=${{ secrets.NSRR_TOKEN }}
+          nsrr download shhs/datasets/ --shallow --token=${{ secrets.NSRR_TOKEN }}
+          nsrr download shhs/datasets/hrv-analysis/ --token=${{ secrets.NSRR_TOKEN }}
+          mkdir -p ~/tmp/nsrr-data/
+          mv shhs/ ~/tmp/nsrr-data/
+          du -sh ~/tmp/nsrr-data/*
+        post: |
+          rm -rf ~/tmp/nsrr-data/
+          du -sh ~/tmp/nsrr-data/*
     - name: Run test SHHS with pytest
       run: |
         pytest -v -s test/test_databases/test_shhs.py
-    - name: Remove downloaded NSRR data
-      run: |
-        rm -rf ~/tmp/nsrr-data/
     - name: Run test other databases with pytest
       run: |
         pytest -v -s test/test_databases/test_cachet_cadb.py