From 1475b6ef9946c36639735bd451fc15fd95996a63 Mon Sep 17 00:00:00 2001 From: Elle Sullivan Date: Mon, 4 Nov 2024 18:43:32 +0000 Subject: [PATCH] Try splitting workflow into two files --- .github/workflows/pir_end_to_end_tests.yml | 15 +-------------- ...sts_scheduled_and_release_branches_trigger.yml | 10 ++++++++++ 2 files changed, 11 insertions(+), 14 deletions(-) create mode 100644 .github/workflows/pir_end_to_end_tests_scheduled_and_release_branches_trigger.yml diff --git a/.github/workflows/pir_end_to_end_tests.yml b/.github/workflows/pir_end_to_end_tests.yml index 2165fee20d..c35b67bec0 100644 --- a/.github/workflows/pir_end_to_end_tests.yml +++ b/.github/workflows/pir_end_to_end_tests.yml @@ -1,10 +1,7 @@ name: PIR E2E Tests on: - workflow_dispatch: - schedule: - - cron: '0 3 * * 1-5' # 3AM UTC offsetted to legacy to avoid action-junit-report@v4 bug - pull_request: + workflow_call: jobs: pir-e2e-tests: @@ -18,16 +15,6 @@ jobs: - xcode-version: "15.4" runner: macos-14-xlarge - if: | - startsWith(github.event.pull_request.base.ref, 'release/') || - startsWith(github.event.pull_request.base.ref, 'hotfix/') || - contains(toJson(github.event.pull_request.files.*.filename), 'DBPE2ETests/') || - contains(toJson(github.event.pull_request.files.*.filename), 'LocalPackages/DataBrokerProtection/') || - contains(toJson(github.event.pull_request.files.*.filename), 'LocalPackages/DataBrokerProtection/') || - contains(toJson(github.event.pull_request.files.*.filename), 'DuckDuckGoDBPBackgroundAgent/') || - contains(toJson(github.event.pull_request.files.*.filename), 'DuckDuckGo.xcodeproj/project.pbxproj') || - github.event_name == 'schedule' - concurrency: group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.runner }} cancel-in-progress: true diff --git a/.github/workflows/pir_end_to_end_tests_scheduled_and_release_branches_trigger.yml b/.github/workflows/pir_end_to_end_tests_scheduled_and_release_branches_trigger.yml new file mode 100644 index 0000000000..1517c44d13 --- /dev/null +++ b/.github/workflows/pir_end_to_end_tests_scheduled_and_release_branches_trigger.yml @@ -0,0 +1,10 @@ +name: PIR E2E Tests Scheduled and release branches trigger + +workflow_dispatch: + schedule: + - cron: '0 3 * * 1-5' # 3AM UTC offsetted to legacy to avoid action-junit-report@v4 bug + pull_request: + +jobs: + call-sub-workflow: + uses: ./.github/workflows/pir_end_end_tests.yml