From bcf5ee4b10df10ae18f4e07ad7d6a9c8c4cf39d5 Mon Sep 17 00:00:00 2001 From: Zachary Stence Date: Mon, 4 Nov 2024 17:25:31 -0600 Subject: [PATCH] ci: chromatic and sources tests need external-pr-action-approval --- .github/workflows/chromatic.yml | 8 +++++--- .github/workflows/tests.yml | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index b9a299d36c..c3827f1108 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -1,17 +1,19 @@ name: 'Chromatic' on: - push: pull_request_target: jobs: + external-pr-action-approval: + uses: ./.github/workflows/external-pr-action-approval.yml chromatic: + needs: external-pr-action-approval runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: - fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} - uses: pnpm/action-setup@v4.0.0 with: version: 8.6.9 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 571a2690be..1e9f1c7e07 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -5,10 +5,6 @@ on: jobs: Tests-sources: - runs-on: ${{ matrix.os }} - if: ${{ github.triggering_actor == 'archiewood' || github.triggering_actor == 'mcrascal' || github.triggering_actor == 'ud3sh' || github.triggering_actor == 'hughess' || github.triggering_actor == 'winterhart' || github.triggering_actor == 'itsmebriand' || github.triggering_actor == 'kwongz' || github.triggering_actor == 'zachstence' || github.triggering_actor == 'csjh'}} - timeout-minutes: 20 - # Conditional Strategy logic from https://github.com/orgs/community/discussions/26253#discussioncomment-3250989 strategy: fail-fast: false @@ -25,6 +21,10 @@ jobs: - isMain: false os: macOS-latest + needs: ./.github/workflows/external-pr-action-approval.yml + runs-on: ${{ matrix.os }} + timeout-minutes: 20 + steps: - run: git config --global core.autocrlf false