From 94d94b3b1fa21a08bbc431fe1fd0f7837226dec3 Mon Sep 17 00:00:00 2001 From: Silke Schomann Date: Wed, 18 Sep 2024 09:10:48 +0100 Subject: [PATCH 1/2] Removed mamba and mambaforge from workflows --- .github/actions/publish-package/action.yml | 4 ++-- .github/workflows/deploy_conda.yml | 1 - .github/workflows/deploy_conda_nightly.yml | 1 - .github/workflows/unit_tests.yml | 1 - .github/workflows/unit_tests_nightly.yml | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/actions/publish-package/action.yml b/.github/actions/publish-package/action.yml index 18bbe913..8445a660 100644 --- a/.github/actions/publish-package/action.yml +++ b/.github/actions/publish-package/action.yml @@ -24,7 +24,7 @@ runs: conda config --set always_yes yes --set changeps1 no conda create -n build-env python=3.10 conda activate build-env - mamba install -c conda-forge mamba conda-build anaconda-client conda-verify boa + conda install -c conda-forge conda-build anaconda-client conda-verify boa conda config --add channels mantid/label/nightly conda config --add channels mantid @@ -33,5 +33,5 @@ runs: run: | conda activate build-env conda config --set anaconda_upload yes - conda mambabuild --user ${{ inputs.repository }} --token ${{ inputs.token }} --label ${{ inputs.label }} $GITHUB_WORKSPACE/conda |& tee upload.log + conda --user ${{ inputs.repository }} --token ${{ inputs.token }} --label ${{ inputs.label }} $GITHUB_WORKSPACE/conda |& tee upload.log grep "Upload complete" upload.log diff --git a/.github/workflows/deploy_conda.yml b/.github/workflows/deploy_conda.yml index c797ef6d..60d84722 100644 --- a/.github/workflows/deploy_conda.yml +++ b/.github/workflows/deploy_conda.yml @@ -21,7 +21,6 @@ jobs: uses: conda-incubator/setup-miniconda@v3 with: miniforge-version: latest - miniforge-variant: Mambaforge activate-environment: mslice-env environment-file: environment.yml auto-activate-base: false diff --git a/.github/workflows/deploy_conda_nightly.yml b/.github/workflows/deploy_conda_nightly.yml index 77add5ab..2afcc14b 100644 --- a/.github/workflows/deploy_conda_nightly.yml +++ b/.github/workflows/deploy_conda_nightly.yml @@ -30,7 +30,6 @@ jobs: uses: conda-incubator/setup-miniconda@v3 with: miniforge-version: latest - miniforge-variant: Mambaforge activate-environment: mslice-env environment-file: environment.yml auto-activate-base: false diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index a25903ff..75c2a7e5 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -19,7 +19,6 @@ jobs: uses: conda-incubator/setup-miniconda@v3 with: miniforge-version: latest - miniforge-variant: Mambaforge activate-environment: mslice-env environment-file: environment.yml auto-activate-base: false diff --git a/.github/workflows/unit_tests_nightly.yml b/.github/workflows/unit_tests_nightly.yml index 9d2bee77..ecbbd57d 100644 --- a/.github/workflows/unit_tests_nightly.yml +++ b/.github/workflows/unit_tests_nightly.yml @@ -19,7 +19,6 @@ jobs: uses: conda-incubator/setup-miniconda@v3 with: miniforge-version: latest - miniforge-variant: Mambaforge activate-environment: mslice-env environment-file: environment.yml auto-activate-base: false From dc5c4303cd1e629b369196bae8410323544be164 Mon Sep 17 00:00:00 2001 From: Silke Schomann Date: Thu, 19 Sep 2024 09:19:40 +0100 Subject: [PATCH 2/2] Revert changes to GitHub action --- .github/actions/publish-package/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/publish-package/action.yml b/.github/actions/publish-package/action.yml index 8445a660..18bbe913 100644 --- a/.github/actions/publish-package/action.yml +++ b/.github/actions/publish-package/action.yml @@ -24,7 +24,7 @@ runs: conda config --set always_yes yes --set changeps1 no conda create -n build-env python=3.10 conda activate build-env - conda install -c conda-forge conda-build anaconda-client conda-verify boa + mamba install -c conda-forge mamba conda-build anaconda-client conda-verify boa conda config --add channels mantid/label/nightly conda config --add channels mantid @@ -33,5 +33,5 @@ runs: run: | conda activate build-env conda config --set anaconda_upload yes - conda --user ${{ inputs.repository }} --token ${{ inputs.token }} --label ${{ inputs.label }} $GITHUB_WORKSPACE/conda |& tee upload.log + conda mambabuild --user ${{ inputs.repository }} --token ${{ inputs.token }} --label ${{ inputs.label }} $GITHUB_WORKSPACE/conda |& tee upload.log grep "Upload complete" upload.log