Improve CI (#1070)

tcbegley · web-flow · commit 72f55c630805 · 2025-01-22T08:08:15.000Z
* Don't duplicate tests

* Adjust triggers

* Test CI definition

* Add build test for release and prerelease branches

* Clean up workflow definition

* Run tests manually

* Remove unused selenium config

* Simplify release pipeline
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,19 +4,32 @@ on:
   pull_request:
     types:
       - closed
+    branches:
+      - release/**
+      - prerelease/**
 
 jobs:
   release:
     name: Release
-    if: ${{ github.event.pull_request.merged && startsWith(github.head_ref, 'release/') }}
+    if: ${{ github.event.pull_request.merged }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
           token: ${{ secrets.GH_ACCESS_TOKEN_TOM }}
 
+      - id: get-release-type
+        run: |
+          echo "type=$(${{ startsWith(github.head_ref, 'prerelease/') }} && echo 'prerelease' || echo 'release')" >> "$GITHUB_OUTPUT"
+          echo "prefix=$(${{ startsWith(github.head_ref, 'prerelease/') }} && echo 'Prerelease' || echo 'Release')" >> "$GITHUB_OUTPUT"
+
       - id: get-version
-        run: echo "version=$(echo ${{ github.head_ref }} | sed 's|release/||')" >> "$GITHUB_OUTPUT"
+        run: |
+          if [ ${{ steps.get-release-type.outputs.type }} = 'prerelease' ]; then
+            echo "version=$(echo ${{ github.head_ref }} | sed 's|prerelease/||')" >> "$GITHUB_OUTPUT"
+          else
+            echo "version=$(echo ${{ github.head_ref }} | sed 's|release/||')" >> "$GITHUB_OUTPUT"
+          fi
 
       - name: Use Node 22
         uses: actions/setup-node@v3
@@ -36,6 +49,7 @@ jobs:
 
       - name: Update docs requirements
         run: just _set-docs-version ${{ steps.get-version.outputs.version }}
+        if: ${{ steps.get-release-type.outputs.type == 'release' }}
 
       - name: Build dash-bootstrap-components
         run: just build
@@ -53,7 +67,7 @@ jobs:
       - name: Commit updated package-lock.json and docs requirements
         uses: stefanzweifel/git-auto-commit-action@v4
         with:
-          commit_message: Release ${{ steps.get-version.outputs.version }}
+          commit_message: ${{ steps.get-release-type.outputs.prefix }} ${{ steps.get-version.outputs.version }}
           branch: main
           push_options: --force
           file_pattern: package-lock.json docs/requirements.txt
@@ -65,79 +79,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ steps.get-version.outputs.version }}
-          release_name: Release ${{ steps.get-version.outputs.version }}
-          body: ${{ github.event.pull_request.body }}
-          prerelease: false
-
-      - name: Post-release cleanup
-        run: just postrelease ${{ steps.get-version.outputs.version }}
-
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: Back to dev
-          branch: main
-          push_options: --force
-          file_pattern: package.json tests/test_version.py dash_bootstrap_components/_version.py
-
-  prerelease:
-    name: Prerelease
-    if: ${{ github.event.pull_request.merged && startsWith(github.head_ref, 'prerelease/') }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.GH_ACCESS_TOKEN_TOM }}
-
-      - id: get-version
-        run: echo "version=$(echo ${{ github.head_ref }} | sed 's|prerelease/||')" >> "$GITHUB_OUTPUT"
-
-      - name: Use Node 22
-        uses: actions/setup-node@v3
-        with:
-          node-version: 22
-
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v3
-        with:
-          version: 'latest'
-
-      - name: Install just
-        uses: extractions/setup-just@v2
-
-      - name: Install JS dependencies
-        run: npm ci
-
-      - name: Build dash-bootstrap-components
-        run: just build
-
-      - uses: JS-DevTools/npm-publish@v1
-        with:
-          token: ${{ secrets.NPM_TOKEN }}
-
-      - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.12.3
-        with:
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages-dir: py-dist/
-
-      - name: Commit updated package-lock.json
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: Release ${{ steps.get-version.outputs.version }}
-          branch: main
-          push_options: --force
-          file_pattern: package-lock.json
-
-      - name: Create GitHub prerelease
-        id: create-prerelease
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ steps.get-version.outputs.version }}
-          release_name: Prerelease ${{ steps.get-version.outputs.version }}
+          release_name: ${{ steps.get-release-type.outputs.prefix }} ${{ steps.get-version.outputs.version }}
           body: ${{ github.event.pull_request.body }}
-          prerelease: true
+          prerelease: ${{ steps.get-release-type.outputs.type == 'prerelease' }}
 
       - name: Post-release cleanup
         run: just postrelease ${{ steps.get-version.outputs.version }}
@@ -147,4 +91,4 @@ jobs:
           commit_message: Back to dev
           branch: main
           push_options: --force
-          file_pattern: package.json tests/test_version.py dash_bootstrap_components/_version.py
+          file_pattern: package.json tests/test_version.py dash_bootstrap_components/_version.py uv.lock
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -0,0 +1,44 @@
+name: Test built package
+
+on:
+  pull_request:
+    branches:
+      - 'release/**'
+      - 'prerelease/**'
+
+jobs:
+  test-build:
+    name: Test build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.GH_ACCESS_TOKEN_TOM }}
+
+      - name: Use Node 22
+        uses: actions/setup-node@v3
+        with:
+          node-version: 22
+
+      - name: Install the latest version of uv
+        uses: astral-sh/setup-uv@v3
+        with:
+          version: 'latest'
+
+      - name: Install just
+        uses: extractions/setup-just@v2
+
+      - name: Install JS dependencies
+        run: npm ci
+
+      - name: Build dash-bootstrap-components
+        run: just build
+
+      - name: Run tests
+        run: |
+          # install the wheel
+          uv pip install py-dist/dash_bootstrap_components*.whl
+          # manually invoke pytest inside the .venv
+          # we can't use uv as `uv run` syncs the source
+          source .venv/bin/activate
+          pytest --headless tests
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,6 +1,10 @@
 name: Tests
 
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
 
 jobs:
   js:
@@ -52,14 +56,6 @@ jobs:
       max-parallel: 6
       matrix:
         python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
-    services:
-      hub:
-        image: selenium/hub:3.141.59-gold
-      firefox:
-        image: selenium/node-chrome:3.141.59-gold
-        env:
-          HUB_HOST: hub
-          HUB_PORT: 4444
     steps:
       - uses: actions/checkout@v1
       - name: Install the latest version of uv
