Merge branch 'main' into dependabot/github_actions/actions/checkout-5

Author: backmari

.github/workflows/deploy.yml

@@ -2,9 +2,11 @@ name: Deploy
 
 on:
   workflow_dispatch:
+  push:
+    tags: ["v*"]
 
 jobs:
-  deploy:
+  conda-deploy:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
@@ -16,10 +18,34 @@ jobs:
         with:
           pixi-version: v0.48.1
 
-      - name: Build and Publish
+      - name: Build and Publish Conda Package
+        env:
+          ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
+        run: |
+          pixi run conda-publish
+
+  pypi-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up pixi
+        uses: prefix-dev/[email protected]
+        with:
+          pixi-version: v0.48.1
+
+      - name: Build and Publish PyPI Package
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
-          ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
         run: |
-          pixi run release 
+          pixi run build-pypi
+          # Only publish to PyPI if token is available
+          if [ -n "$TWINE_PASSWORD" ]; then
+            echo "PyPI token found, publishing to PyPI..."
+            pixi run pypi-publish
+          else
+            echo "No PyPI token found, skipping PyPI publishing"
+          fi

.github/workflows/test_and_deploy.yaml

@@ -0,0 +1,107 @@
+name: Tests, Package, and Deployment
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches: [next, qa, main]
+    tags: ["v*"]
+
+env:
+  PKG_NAME: plot-publisher
+  MODULE_NAME: plot_publisher
+
+jobs:
+  tests:
+    name: Unit tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Setup pixi
+        uses: prefix-dev/[email protected]
+        with:
+          pixi-version: v0.50.2
+          manifest-path: pyproject.toml
+
+      - name: Run unit tests
+        run: pixi run test
+
+      - name: Upload coverage to codecov
+        uses: codecov/codecov-action@v5
+        if: github.actor != 'dependabot[bot]'
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+
+  conda-build:
+    name: Build conda package
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Setup pixi
+        uses: prefix-dev/[email protected]
+        with:
+          pixi-version: v0.50.2
+          manifest-path: pyproject.toml
+
+      - name: Build conda package
+        run: |
+          pixi run conda-build
+          mkdir -p /tmp/local-channel/linux-64
+          cp *.conda /tmp/local-channel/linux-64
+
+      - name: Verify conda package
+        uses: neutrons/conda-verify@main
+        with:
+          package-name: ${{ env.PKG_NAME }}
+          module-name: ${{ env.MODULE_NAME }}
+          local-channel: /tmp/local-channel
+
+      - name: Upload conda package as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: artifact-conda-package
+          path: ${{ env.PKG_NAME }}-*.conda
+
+  publish:
+    name: Upload package to anaconda
+    runs-on: ubuntu-latest
+    needs: [tests, conda-build]
+    if: startsWith(github.ref, 'refs/tags/v')
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Setup Pixi
+        uses: prefix-dev/[email protected]
+        with:
+          pixi-version: v0.50.2
+          manifest-path: pyproject.toml
+
+      - name: Download conda package artifact
+        uses: actions/download-artifact@v5
+        with:
+          name: artifact-conda-package
+
+      - name: Upload package to anaconda
+        env:
+          ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
+          IS_RC: ${{ contains(github.ref, 'rc') }}
+        run: |
+          # label is main or rc depending on the tag-name
+          CONDA_LABEL="main"
+          if [ "${IS_RC}" = "true" ]; then CONDA_LABEL="rc"; fi
+          echo pushing ${{ github.ref }} with label $CONDA_LABEL
+          pixi run anaconda upload --label $CONDA_LABEL --user neutrons ${{ env.PKG_NAME }}-*.conda

.github/workflows/update-lockfiles.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Update lockfile
         run: pixi update
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "build: update lockfile"