test(CI): merge queue Test 1.1 (#1263)

posit-dev · Mar 28, 2024 · a9b94f8 · a9b94f8
1 parent c1ebce9
commit a9b94f8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/.github/py-shiny/pytest-browsers/action.yaml b/.github/py-shiny/pytest-browsers/action.yaml
@@ -10,7 +10,7 @@ outputs:
     description: 'pytest browsers to use'
     value: ${{ steps.browsers.outputs.browsers }}
 runs:
-  using: 'composite'
+  using: "composite"
   steps:
       - name: Determine browsers to use
         shell: bash
@@ -21,10 +21,10 @@ runs:
             exit 0
           fi
 
-          if [ "${{ github.event_name }}" == "merge_group" ]; then
-            echo "No custom pytest browsers for merge_group event!"
-            exit 0
+          if [ "${{ github.event_name }}" == "pull_request" ]; then
+            echo "Using chrome browser only!"
+            echo 'browsers=PYTEST_BROWSERS="--browser chromium"' >> "$GITHUB_OUTPUT"
           fi
 
-          echo "Using chrome browser only!"
-          echo 'browsers=PYTEST_BROWSER="--browser chromium"' >> "$GITHUB_OUTPUT"
+          echo "No custom pytest browsers!"
+          exit 0
diff --git a/.github/workflows/build-docs.yaml b/.github/workflows/build-docs.yaml
@@ -8,7 +8,7 @@ on:
   merge_group:
 
 jobs:
-  build:
+  build-docs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -43,7 +43,7 @@ jobs:
           make quartodoc
 
       - name: Build site
-        if: github.event != 'merge_group'
+        if: ${{ github.event_name != 'pull_request' || startsWith(github.head_ref, 'docs')  }}
         run: |
           cd docs
           make site
@@ -56,7 +56,7 @@ jobs:
 
   deploy:
     if: github.ref == 'refs/heads/main'
-    needs: build
+    needs: build-docs
 
     # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
     permissions:

diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
@@ -12,7 +12,7 @@ on:
     - cron: "0 8 * * *"
 
 jobs:
-  build:
+  check:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -70,6 +70,9 @@ jobs:
         id: browsers
         with:
           all-browsers: ${{ startsWith(github.head_ref, 'playwright') }}
+      - name: Display browser
+        shell: bash
+        run: echo '${{ steps.browsers.outputs.browsers }}'
       - name: Run End-to-End tests
         timeout-minutes: 20
         run: |
@@ -98,7 +101,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: "18"
           cache: npm
@@ -208,7 +211,7 @@ jobs:
     name: "Deploy to PyPI"
     runs-on: ubuntu-latest
     if: github.event_name == 'release'
-    needs: [build]
+    needs: [check]
     steps:
       - uses: actions/checkout@v4
       - name: "Set up Python 3.10"
@@ -264,7 +267,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: "18"
           cache: npm

diff --git a/.github/workflows/verify-js-built.yaml b/.github/workflows/verify-js-built.yaml
@@ -1,4 +1,4 @@
-name: Build
+name: Verify built assets
 
 on:
   push: