From 9bad208b77848ac107fa085e80b2846cabe64e0d Mon Sep 17 00:00:00 2001 From: Laura Murgatroyd <60604372+lauramurgatroyd@users.noreply.github.com> Date: Thu, 13 Nov 2025 11:49:28 +0000 Subject: [PATCH 1/5] Add conda-print job to CI workflow Added a new job 'conda-print' to print contents of the dist folder after building the conda package. --- .github/workflows/conda_build_and_publish.yml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/conda_build_and_publish.yml b/.github/workflows/conda_build_and_publish.yml index 03fccc2f..0f50b498 100644 --- a/.github/workflows/conda_build_and_publish.yml +++ b/.github/workflows/conda_build_and_publish.yml @@ -37,6 +37,30 @@ jobs: name: cilviewer path: dist + + conda-print: + if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'release' + runs-on: ubuntu-22.04 + needs: build + defaults: {run: {shell: 'bash -el {0}', working-directory: dist}} + steps: + - uses: conda-incubator/setup-miniconda@v3 + with: + mamba-version: "*" + channels: conda-forge + + - name: Download built conda package + uses: actions/download-artifact@v4 + with: + name: cilviewer + path: dist + + - run: conda install anaconda-client + + - name: print contents of dist folder + run: > + ls dist + conda-upload: if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'release' runs-on: ubuntu-22.04 From 52a4507419531b349f761e03772325c1fe2155e4 Mon Sep 17 00:00:00 2001 From: Laura Murgatroyd <60604372+lauramurgatroyd@users.noreply.github.com> Date: Thu, 13 Nov 2025 11:56:55 +0000 Subject: [PATCH 2/5] Update conda-print job condition Remove condition for conda-print job to always run. --- .github/workflows/conda_build_and_publish.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/conda_build_and_publish.yml b/.github/workflows/conda_build_and_publish.yml index 0f50b498..104f9c58 100644 --- a/.github/workflows/conda_build_and_publish.yml +++ b/.github/workflows/conda_build_and_publish.yml @@ -39,7 +39,6 @@ jobs: conda-print: - if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'release' runs-on: ubuntu-22.04 needs: build defaults: {run: {shell: 'bash -el {0}', working-directory: dist}} From 0173acc3b1932ff9012da84292d48052c8d7db75 Mon Sep 17 00:00:00 2001 From: Laura Murgatroyd <60604372+lauramurgatroyd@users.noreply.github.com> Date: Thu, 13 Nov 2025 12:04:44 +0000 Subject: [PATCH 3/5] Update directory listing in workflow file Changed directory listing command to show current directory instead of 'dist'. --- .github/workflows/conda_build_and_publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda_build_and_publish.yml b/.github/workflows/conda_build_and_publish.yml index 104f9c58..fb96cb16 100644 --- a/.github/workflows/conda_build_and_publish.yml +++ b/.github/workflows/conda_build_and_publish.yml @@ -58,7 +58,7 @@ jobs: - name: print contents of dist folder run: > - ls dist + ls . conda-upload: if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'release' From bfb30d305e72129f73cf7442573f4e7cfbff7ab8 Mon Sep 17 00:00:00 2001 From: Laura Murgatroyd <60604372+lauramurgatroyd@users.noreply.github.com> Date: Thu, 13 Nov 2025 12:18:26 +0000 Subject: [PATCH 4/5] Update directory listing in conda build workflow Change directory listing command to show 'noarch' folder contents. --- .github/workflows/conda_build_and_publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda_build_and_publish.yml b/.github/workflows/conda_build_and_publish.yml index fb96cb16..3e1bfaa1 100644 --- a/.github/workflows/conda_build_and_publish.yml +++ b/.github/workflows/conda_build_and_publish.yml @@ -58,7 +58,7 @@ jobs: - name: print contents of dist folder run: > - ls . + ls noarch conda-upload: if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'release' From 37b52bdc5dd091581e0bb4699a57e260500e72a8 Mon Sep 17 00:00:00 2001 From: Laura Murgatroyd <60604372+lauramurgatroyd@users.noreply.github.com> Date: Thu, 13 Nov 2025 14:15:39 +0000 Subject: [PATCH 5/5] Update conda_build_and_publish.yml --- .github/workflows/conda_build_and_publish.yml | 25 +------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/.github/workflows/conda_build_and_publish.yml b/.github/workflows/conda_build_and_publish.yml index 3e1bfaa1..99681008 100644 --- a/.github/workflows/conda_build_and_publish.yml +++ b/.github/workflows/conda_build_and_publish.yml @@ -37,29 +37,6 @@ jobs: name: cilviewer path: dist - - conda-print: - runs-on: ubuntu-22.04 - needs: build - defaults: {run: {shell: 'bash -el {0}', working-directory: dist}} - steps: - - uses: conda-incubator/setup-miniconda@v3 - with: - mamba-version: "*" - channels: conda-forge - - - name: Download built conda package - uses: actions/download-artifact@v4 - with: - name: cilviewer - path: dist - - - run: conda install anaconda-client - - - name: print contents of dist folder - run: > - ls noarch - conda-upload: if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'release' runs-on: ubuntu-22.04 @@ -81,4 +58,4 @@ jobs: - name: Upload to ccpi anaconda channel run: > - anaconda -v -t ${{ secrets.ANACONDA_TOKEN }} upload --force --label 'main' dist/noarch/* + anaconda -v -t ${{ secrets.ANACONDA_TOKEN }} upload --force --label 'main' noarch/*