From a21889c42a27aa995abda8fba707054d72237ac9 Mon Sep 17 00:00:00 2001 From: Barret Schloerke Date: Thu, 28 Mar 2024 13:23:12 -0400 Subject: [PATCH 1/9] touch1 --- .github/py-shiny/pytest-browsers/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/py-shiny/pytest-browsers/action.yaml b/.github/py-shiny/pytest-browsers/action.yaml index de52d959e..33da0d0ad 100644 --- 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 From 877d279bea2138b1d89a6ea6448029eec6d79a06 Mon Sep 17 00:00:00 2001 From: Barret Schloerke Date: Thu, 28 Mar 2024 13:36:58 -0400 Subject: [PATCH 2/9] Revert "test(CI): merge queue Test 1 (#1260)" This reverts commit 48b47c7b70fe72548a7502deca0f90ed7723db0f. --- .github/py-shiny/pytest-browsers/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/py-shiny/pytest-browsers/action.yaml b/.github/py-shiny/pytest-browsers/action.yaml index 8be68fe6d..da995f02c 100644 --- 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 From 71f74fd78ba874e29b37ca707c79e5a8ec9cba58 Mon Sep 17 00:00:00 2001 From: Barret Schloerke Date: Thu, 28 Mar 2024 13:44:46 -0400 Subject: [PATCH 3/9] Display browser in test --- .github/workflows/pytest.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml index f5e38c14e..22e168c11 100644 --- a/.github/workflows/pytest.yaml +++ b/.github/workflows/pytest.yaml @@ -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: | From 9c54a9ed7f0fb4d88c351ec73ef86c5ee7b68087 Mon Sep 17 00:00:00 2001 From: Barret Schloerke Date: Thu, 28 Mar 2024 13:50:09 -0400 Subject: [PATCH 4/9] Typo --- .github/py-shiny/pytest-browsers/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/py-shiny/pytest-browsers/action.yaml b/.github/py-shiny/pytest-browsers/action.yaml index da995f02c..e4b3a58fc 100644 --- a/.github/py-shiny/pytest-browsers/action.yaml +++ b/.github/py-shiny/pytest-browsers/action.yaml @@ -27,4 +27,4 @@ runs: fi echo "Using chrome browser only!" - echo 'browsers=PYTEST_BROWSER="--browser chromium"' >> "$GITHUB_OUTPUT" + echo 'browsers=PYTEST_BROWSERS="--browser chromium"' >> "$GITHUB_OUTPUT" From 839ed1c976cb84c9356ed5037e71d90746706d6e Mon Sep 17 00:00:00 2001 From: Barret Schloerke Date: Thu, 28 Mar 2024 13:59:39 -0400 Subject: [PATCH 5/9] Update build-docs.yaml --- .github/workflows/build-docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docs.yaml b/.github/workflows/build-docs.yaml index 3beea0b11..2c8ceb545 100644 --- a/.github/workflows/build-docs.yaml +++ b/.github/workflows/build-docs.yaml @@ -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 From 14b3fb50dc1d4f76244f9a0869c673e89f9b0273 Mon Sep 17 00:00:00 2001 From: Barret Schloerke Date: Thu, 28 Mar 2024 14:26:31 -0400 Subject: [PATCH 6/9] Invert logic to get closer to intent --- .github/py-shiny/pytest-browsers/action.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/py-shiny/pytest-browsers/action.yaml b/.github/py-shiny/pytest-browsers/action.yaml index e4b3a58fc..997d23c88 100644 --- a/.github/py-shiny/pytest-browsers/action.yaml +++ b/.github/py-shiny/pytest-browsers/action.yaml @@ -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_BROWSERS="--browser chromium"' >> "$GITHUB_OUTPUT" + echo "No custom pytest browsers!" + exit 0 From ad179b15dd502d81138a1393f394ced3edcc2715 Mon Sep 17 00:00:00 2001 From: Barret Schloerke Date: Thu, 28 Mar 2024 14:36:05 -0400 Subject: [PATCH 7/9] Update action.yaml --- .github/py-shiny/pytest-browsers/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/py-shiny/pytest-browsers/action.yaml b/.github/py-shiny/pytest-browsers/action.yaml index 997d23c88..e92c9961a 100644 --- a/.github/py-shiny/pytest-browsers/action.yaml +++ b/.github/py-shiny/pytest-browsers/action.yaml @@ -21,7 +21,7 @@ runs: exit 0 fi - if [ "${{ github.event_name }}" == "pull-request" ]; then + if [ "${{ github.event_name }}" == "pull_request" ]; then echo "Using chrome browser only!" echo 'browsers=PYTEST_BROWSERS="--browser chromium"' >> "$GITHUB_OUTPUT" fi From 4103c7cec9c06833cf0a68c6aa139ef35a9872cc Mon Sep 17 00:00:00 2001 From: Barret Schloerke Date: Thu, 28 Mar 2024 14:41:00 -0400 Subject: [PATCH 8/9] Clearer names --- .github/workflows/build-docs.yaml | 4 ++-- .github/workflows/pytest.yaml | 4 ++-- .github/workflows/verify-js-built.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-docs.yaml b/.github/workflows/build-docs.yaml index 2c8ceb545..7cc001a61 100644 --- 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: @@ -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 index 22e168c11..6f5b81b31 100644 --- 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: @@ -211,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" diff --git a/.github/workflows/verify-js-built.yaml b/.github/workflows/verify-js-built.yaml index 71d1b4a7d..d38cd1a7d 100644 --- 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: From 27e211df59ef0ac107d8bfb0e7906dfa1f9c6532 Mon Sep 17 00:00:00 2001 From: Barret Schloerke Date: Thu, 28 Mar 2024 15:27:00 -0400 Subject: [PATCH 9/9] `actions/setup-node@v3` -> `actions/setup-node@v4` --- .github/workflows/pytest.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml index 6f5b81b31..ddc857c25 100644 --- a/.github/workflows/pytest.yaml +++ b/.github/workflows/pytest.yaml @@ -101,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 @@ -267,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