Skip to content

Commit

Permalink
Merge pull request #982 from mantidproject/fix_for_mantid_install
Browse files Browse the repository at this point in the history
Fix for failing unit test workflows
  • Loading branch information
SilkeSchomann committed Mar 26, 2024
2 parents e5b0af3 + 2985f43 commit cd6b1e2
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy_conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fetch-depth: 0

- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v2.2.0
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-version: latest
miniforge-variant: Mambaforge
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_conda_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Setup Miniconda
if: ${{ env.recentCommits == 'true'}}
uses: conda-incubator/setup-miniconda@v2.2.0
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-version: latest
miniforge-variant: Mambaforge
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fetch-depth: 0

- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v2.2.0
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-version: latest
miniforge-variant: Mambaforge
Expand All @@ -26,7 +26,7 @@ jobs:

- name: Install Mantid
run: |
mamba install -c mantid/label/nightly mantid mantidqt
conda install -c mantid/label/nightly mantid mantidqt
- name: Run Tests and Coverage
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit_tests_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: actions/checkout@v3

- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v2.2.0
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-version: latest
miniforge-variant: Mambaforge
Expand All @@ -26,7 +26,7 @@ jobs:

- name: Install Mantid
run: |
mamba install -c mantid/label/nightly mantid mantidqt
conda install -c mantid/label/nightly mantid mantidqt
- name: Run Tests and Coverage
run: |
Expand Down

0 comments on commit cd6b1e2

Please sign in to comment.