From 90da74bed8df0514934174b836d1ed4faf58b518 Mon Sep 17 00:00:00 2001 From: Jeff Chew Date: Thu, 30 Jan 2025 13:58:10 -0500 Subject: [PATCH 1/3] fix(ghactions): fix GH_TOKEN env setting --- .github/workflows/release-minor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-minor.yml b/.github/workflows/release-minor.yml index 1bebdb004..f4e4c65aa 100644 --- a/.github/workflows/release-minor.yml +++ b/.github/workflows/release-minor.yml @@ -18,6 +18,8 @@ jobs: id-token: write contents: write timeout-minutes: 60 + env: + GH_TOKEN: ${{ secrets.MERGE_ACTION }} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: @@ -40,5 +42,3 @@ jobs: - name: Publish minor release of packages run: | yarn lerna publish minor --dist-tag latest --yes --message 'chore: release' - env: - GH_TOKEN: ${{ secrets.MERGE_ACTION }} From d4e0aec54abfee08d4c9bada98c06d94108e6af8 Mon Sep 17 00:00:00 2001 From: Jeff Chew Date: Fri, 31 Jan 2025 11:45:51 -0500 Subject: [PATCH 2/3] chore(ghactions): add dco to merge queue check --- .github/workflows/dco.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml index b8f75f415..a140ec8e6 100644 --- a/.github/workflows/dco.yml +++ b/.github/workflows/dco.yml @@ -4,6 +4,8 @@ on: types: [created] pull_request_target: types: [opened, closed, synchronize] + merge_group: + types: [ checks_requested ] jobs: DCOAssistant: From ea4ddd07b027b732b345dbf9633fcc1d7be0d06d Mon Sep 17 00:00:00 2001 From: Jeff Chew Date: Fri, 31 Jan 2025 11:47:54 -0500 Subject: [PATCH 3/3] chore(ghactions): remove delta from main --- .github/workflows/release-minor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-minor.yml b/.github/workflows/release-minor.yml index 3064d75e7..c2f3d9b2b 100644 --- a/.github/workflows/release-minor.yml +++ b/.github/workflows/release-minor.yml @@ -18,8 +18,6 @@ jobs: id-token: write contents: write timeout-minutes: 60 - env: - GH_TOKEN: ${{ secrets.MERGE_ACTION }} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: @@ -43,3 +41,5 @@ jobs: - name: Publish minor release of packages run: | yarn lerna publish minor --dist-tag latest --yes --message 'chore: release' + env: + GH_TOKEN: ${{ secrets.MERGE_ACTION }}