diff --git a/.github/actions/publish-package/action.yml b/.github/actions/publish-package/action.yml index aba3151e..f6cfbc39 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 conda activate build-env - mamba install -c conda-forge mamba conda-build anaconda-client conda-verify boa setuptools=75.1.0 + 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 diff --git a/.github/workflows/deploy_conda_nightly.yml b/.github/workflows/deploy_conda_nightly.yml index c35ee1ea..6a240873 100644 --- a/.github/workflows/deploy_conda_nightly.yml +++ b/.github/workflows/deploy_conda_nightly.yml @@ -1,11 +1,11 @@ name: Deploy MSlice nightly -on: push -# workflow_run: -# workflows: ["MSlice nightly build"] -# branches: [main] -# types: -# - completed +on: + workflow_run: + workflows: ["MSlice nightly build"] + branches: [main] + types: + - completed jobs: build_conda_and_upload: @@ -26,7 +26,7 @@ jobs: echo "recentCommits=$(test -z $(git log --since="yesterday" -1 --format=%h) && echo false || echo true)" >> $GITHUB_ENV - name: Setup Miniconda -# if: ${{ env.recentCommits == 'true'}} + if: ${{ env.recentCommits == 'true'}} uses: conda-incubator/setup-miniconda@v3 with: miniforge-version: latest @@ -35,7 +35,7 @@ jobs: auto-activate-base: false - name: Build MSlice nightly conda package -# if: ${{ env.recentCommits == 'true'}} + if: ${{ env.recentCommits == 'true'}} uses: ./.github/actions/publish-package with: label: nightly