From d93d193534b064946c86fb1ad1c28bf22949901c Mon Sep 17 00:00:00 2001 From: Kevin Meinhardt Date: Fri, 24 Nov 2023 16:12:10 +0000 Subject: [PATCH 1/4] chore(): new attempt --- .github/workflows/merge_queue.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/merge_queue.yml b/.github/workflows/merge_queue.yml index 111b2e4..5e2d16d 100644 --- a/.github/workflows/merge_queue.yml +++ b/.github/workflows/merge_queue.yml @@ -1,12 +1,10 @@ name: merge queueu on: + pull_request: merge_group: - types: [checks_requested] - push: - branches: - - gh-readonly-queue/main/* jobs: build: + if: ${{ github.event_name == 'merge_group' }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From 2134e6d9506f302f61b4d28b195b8f1a4745927d Mon Sep 17 00:00:00 2001 From: Kevin Meinhardt Date: Fri, 24 Nov 2023 16:16:20 +0000 Subject: [PATCH 2/4] chore(): use specific named jobs --- .github/workflows/ci.yml | 2 +- .github/workflows/merge_queue.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc7968d..339cdf2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,7 @@ name: ci build on: pull_request: jobs: - build: + ci_build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/merge_queue.yml b/.github/workflows/merge_queue.yml index 5e2d16d..3fe5d01 100644 --- a/.github/workflows/merge_queue.yml +++ b/.github/workflows/merge_queue.yml @@ -3,7 +3,7 @@ on: pull_request: merge_group: jobs: - build: + merge_build: if: ${{ github.event_name == 'merge_group' }} runs-on: ubuntu-latest steps: From c7d6bde9ffe5eeb045a18a4f6f73759de24f7228 Mon Sep 17 00:00:00 2001 From: Kevin Meinhardt Date: Fri, 24 Nov 2023 16:23:56 +0000 Subject: [PATCH 3/4] chore(): merge queue passes --- .github/workflows/merge_queue.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge_queue.yml b/.github/workflows/merge_queue.yml index 3fe5d01..cc57c62 100644 --- a/.github/workflows/merge_queue.yml +++ b/.github/workflows/merge_queue.yml @@ -17,5 +17,5 @@ jobs: - name: Build run: npm run build env: - CI_DELAY: "60000" - CI_FAIL: "1" + CI_DELAY: "10000" + CI_FAIL: "" From 20b6609802ed5404b4bb93e5ccfcbb906fa0c251 Mon Sep 17 00:00:00 2001 From: Kevin Meinhardt Date: Fri, 24 Nov 2023 17:53:24 +0000 Subject: [PATCH 4/4] chore(): slower build --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 339cdf2..b24b80d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,5 +15,5 @@ jobs: - name: Build run: npm run build env: - CI_DELAY: "10000" + CI_DELAY: "60000" CI_FAIL: ""