Skip to content

Commit

Permalink
Merge pull request #44 from Unique-Usman/usman
Browse files Browse the repository at this point in the history
Updated the github workflow actions to updated one
  • Loading branch information
etpeterson authored Mar 1, 2024
2 parents fac848a + 92a80d6 commit ae198b3
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
outputs: # here we use the outputs from steps, and set outputs for the job `configure`
algorithms: ${{ steps.algorithms.outputs.algorithms }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
id: setup_python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"
cache: 'pip'
Expand Down Expand Up @@ -53,9 +53,9 @@ jobs:
algorithm: ${{fromJson(needs.algorithms.outputs.algorithms).algorithms}}
SNR: [10, 30, 50, 100, 200]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"
cache: 'pip'
Expand All @@ -75,7 +75,7 @@ jobs:
source .venv/bin/activate
python -m pytest -m slow --selectAlgorithm ${{ matrix.algorithm }} --saveFileName test_output_${{ matrix.algorithm }}_${{ matrix.SNR }}.csv --SNR ${{ matrix.SNR }} --fitCount 300 --saveDurationFileName test_duration_${{ matrix.algorithm }}_${{ matrix.SNR }}.csv
- name: Upload raw data
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Working_Data
retention-days: 1
Expand All @@ -88,7 +88,7 @@ jobs:
needs: build
steps:
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: artifacts
- name: Merge fitting results
Expand All @@ -100,7 +100,7 @@ jobs:
head -n 1 $(ls artifacts/Working_Data/test_duration_*.csv | head -n 1) > test_duration.csv
tail -q -n +2 artifacts/Working_Data/test_duration_*.csv >> test_duration.csv
- name: Upload merged artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Data
path: |
Expand All @@ -111,7 +111,7 @@ jobs:
runs-on: ubuntu-latest
needs: merge
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up R
uses: r-lib/actions/setup-r@v2
with:
Expand All @@ -126,13 +126,13 @@ jobs:
any::data.table
any::ggplot2
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Data
- name: Generate figures
run: Rscript --vanilla tests/IVIMmodels/unit_tests/analyze.r test_output.csv test_duration.csv
- name: Upload figures
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: Figures
Expand All @@ -151,7 +151,7 @@ jobs:
runs-on: ubuntu-latest
needs: merge
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up R
uses: r-lib/actions/setup-r@v2
with:
Expand All @@ -163,7 +163,7 @@ jobs:
any::tidyverse
any::assertr
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Data
- name: Test against previous results
Expand All @@ -175,4 +175,4 @@ jobs:
name: Comparison
path: |
test_reference.csv
test_results.csv
test_results.csv
4 changes: 2 additions & 2 deletions .github/workflows/unit_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
# - os: windows-latest
# python-version: "3.7"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
Expand Down

0 comments on commit ae198b3

Please sign in to comment.