From 1aeb16190ad771a35a6f6f157bc8f27c76a64379 Mon Sep 17 00:00:00 2001 From: Michael Walsh Date: Mon, 26 Jan 2026 11:13:06 -0500 Subject: [PATCH 1/3] update conda builda and verify steps --- .github/workflows/package.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml index e41d29b47..44d4bf216 100644 --- a/.github/workflows/package.yaml +++ b/.github/workflows/package.yaml @@ -26,6 +26,20 @@ jobs: - name: build conda package run: | pixi run build-conda + mkdir -p /tmp/local-channel/noarch + cp *.conda /tmp/local-channel/noarch/ + # extract version from the package file name "snapred--.conda" + echo "PKG_VERSION=$(ls *.conda | cut -d'-' -f2)" >> $GITHUB_ENV + - name: Verify Conda Package + uses: neutrons/conda-verify@v0.1.2 + with: + python-version: "3.11" + local-channel: /tmp/local-channel + package-name: ${{ env.PKG_NAME }}=${{ env.PKG_VERSION }} # install exact version + extra-channels: neutrons mantid oncat conda-forge + extra-commands: | + python -c "import snapred" + python -c "import mantid" - name: upload conda package to anaconda if: startsWith(github.ref, 'refs/tags/v') env: From 9ceb65c6a60d8f15291debbf57c8bd9e2460bdfd Mon Sep 17 00:00:00 2001 From: Michael Walsh Date: Mon, 26 Jan 2026 11:18:26 -0500 Subject: [PATCH 2/3] update paths to look for conda package --- .github/workflows/package.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml index 44d4bf216..62e0069a0 100644 --- a/.github/workflows/package.yaml +++ b/.github/workflows/package.yaml @@ -27,7 +27,9 @@ jobs: run: | pixi run build-conda mkdir -p /tmp/local-channel/noarch + mkdir -p /tmp/local-channel/linux-64 cp *.conda /tmp/local-channel/noarch/ + cp *.conda /tmp/local-channel/linux-64/ # extract version from the package file name "snapred--.conda" echo "PKG_VERSION=$(ls *.conda | cut -d'-' -f2)" >> $GITHUB_ENV - name: Verify Conda Package From c5a83c0a873b0a1d577d8f416c360dfb2504bb9d Mon Sep 17 00:00:00 2001 From: Michael Walsh Date: Mon, 26 Jan 2026 12:02:27 -0500 Subject: [PATCH 3/3] update package name in actions yml: --- .github/workflows/package.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml index 62e0069a0..7b50ca688 100644 --- a/.github/workflows/package.yaml +++ b/.github/workflows/package.yaml @@ -8,6 +8,14 @@ on: pull_request: # Run on pull requests targeting any base branch +# cancel previous job if new commit is pushed +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +env: + PKG_NAME: snapred + jobs: linux: runs-on: ubuntu-latest