From 2c2553a50807c4c9f72da4aa61d46bf92d5166bc Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 23 Jan 2024 14:50:30 +0100 Subject: [PATCH] fixup! meta: merge `output-watcher` and `e2e` workflows --- .github/workflows/e2e.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 290634181..a261c384e 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -98,8 +98,8 @@ jobs: - name: Fetch source from the PR if: steps.build_chain_changes.outputs.MIGHT_CONTAIN_OTHER_CHANGES != '' && - (!github.event.pull_request || - (contains(github.event.pull_request.labels.*.name, 'safe to test') && + (!github.event.pull_request || (github.event.action == 'labeled' && + github.event.label.name == 'safe to test' && github.event.pull_request.state == 'open') || (github.event.pull_request.head.repo.full_name == github.repository && github.event.event_name != 'labeled')) @@ -118,7 +118,8 @@ jobs: if: steps.build_chain_changes.outputs.MIGHT_CONTAIN_OTHER_CHANGES != '' && github.event.pull_request.head.repo.full_name != github.repository && - !contains(github.event.pull_request.labels.*.name, 'safe to test') + (github.event.action != 'labeled' || github.event.label.name != 'safe + to test') run: | git checkout FETCH_HEAD -- packages - run: corepack yarn build:lib @@ -180,7 +181,8 @@ jobs: needs: [compare_diff] if: github.event.pull_request.state == 'open' && - github.event.pull_request.head.repo.full_name != github.repository + github.event.pull_request.head.repo.full_name != github.repository && + github.event.action != 'labeled' runs-on: ubuntu-latest steps: - name: Add label @@ -214,8 +216,8 @@ jobs: needs: [compare_diff] if: ${{ needs.compare_diff.outputs.diff != '' && (!github.event.pull_request - || (contains(github.event.pull_request.labels.*.name, 'safe to test') && - github.event.pull_request.state == 'open') || + || (github.event.action == 'labeled' && github.event.label.name == 'safe + to test' && github.event.pull_request.state == 'open') || (github.event.pull_request.head.repo.full_name == github.repository && github.event.event_name != 'labeled')) }} name: Browser tests