From 77020b07a376cbb430a6d1a41ba855d43f2fc54a Mon Sep 17 00:00:00 2001 From: Taylor Jones Date: Fri, 14 Jul 2023 10:36:04 -0500 Subject: [PATCH] chore(workflows): update workflows to be compatible with GH merge queue (#14222) * chore(workflows): update workflows to be compatible with GH merge queue * chore(kodiak): disable kodiak by removing the config file --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- .github/workflows/add-to-merge-queue.yml | 23 +++++++++++++++ .github/workflows/ci.yml | 8 +++-- .github/workflows/codeql-analysis.yml | 2 ++ .github/workflows/dco.yml | 37 ++++++++++++++++-------- .github/workflows/v10-ci.yml | 2 ++ .kodiak.toml | 7 ----- 6 files changed, 58 insertions(+), 21 deletions(-) create mode 100644 .github/workflows/add-to-merge-queue.yml delete mode 100644 .kodiak.toml diff --git a/.github/workflows/add-to-merge-queue.yml b/.github/workflows/add-to-merge-queue.yml new file mode 100644 index 000000000000..a6092eaaa78f --- /dev/null +++ b/.github/workflows/add-to-merge-queue.yml @@ -0,0 +1,23 @@ +name: Add To Merge Queue +on: + pull_request: + types: [labeled] + +env: + LABEL_READY_TO_MERGE: 'status: ready to merge 🎉' + LABEL_ENABLE_AUTOMERGE: 'status: enable automerge 🟠' + +jobs: + add-to-merge-queue: + name: Add the PR to the merge queue + runs-on: ubuntu-latest + steps: + - name: 'Add to merge queue if either of the automerge labels are added' + if: + ${{ contains(github.event.issue.labels.*.name, + env.LABEL_READY_TO_MERGE) || + contains(github.event.issue.labels.*.name, env.LABEL_ENABLE_AUTOMERGE) + }} + run: gh pr merge + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1fba41117961..d873ddc0909b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,6 +6,8 @@ on: pull_request: branches: - main + merge_group: + types: [checks_requested] concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -138,7 +140,8 @@ jobs: - name: Build project run: yarn build - name: Build storybook - run: STORYBOOK_STORE_7=false yarn workspace @carbon/react storybook:build + run: + STORYBOOK_STORE_7=false yarn workspace @carbon/react storybook:build - name: Run storybook id: storybook run: | @@ -196,7 +199,8 @@ jobs: - name: Build project run: yarn build - name: Build storybook - run: STORYBOOK_STORE_7=false yarn workspace @carbon/react storybook:build + run: + STORYBOOK_STORE_7=false yarn workspace @carbon/react storybook:build - name: Run storybook id: storybook run: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index bb2ea4ee6a8d..4a1147b741a1 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -5,6 +5,8 @@ on: branches: [main, v10] pull_request: branches: [main, v10] + merge_group: + types: [checks_requested] schedule: - cron: '0 12 * * 1' diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml index eb69274deb30..bc330f625e35 100644 --- a/.github/workflows/dco.yml +++ b/.github/workflows/dco.yml @@ -1,31 +1,44 @@ -name: "DCO Assistant" +name: 'DCO Assistant' on: issue_comment: types: [created] pull_request_target: types: [opened, closed, synchronize] + merge_group: + types: [checks_requested] jobs: DCO: runs-on: ubuntu-latest steps: - - name: "DCO Assistant" - if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the DCO document and I hereby sign the DCO.') || github.event_name == 'pull_request_target' + - name: 'DCO Assistant' + if: + (github.event.comment.body == 'recheck' || github.event.comment.body + == 'I have read the DCO document and I hereby sign the DCO.') || + github.event_name == 'pull_request_target' uses: cla-assistant/github-action@v2.3.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} with: - path-to-signatures: "dco-signatures.json" - path-to-document: "https://github.com/carbon-design-system/carbon-dco/blob/main/dco.md" - branch: "main" + path-to-signatures: 'dco-signatures.json' + path-to-document: 'https://github.com/carbon-design-system/carbon-dco/blob/main/dco.md' + branch: 'main' allowlist: bot* remote-organization-name: carbon-design-system remote-repository-name: carbon-dco - create-file-commit-message: "chore: create file to store dco signatures" - signed-commit-message: "chore: $contributorName has signed the dco in #$pullRequestNo" - custom-notsigned-prcomment: "Thanks for your submission! We ask that $you sign our [Developer Certificate of Origin](https://github.com/carbon-design-system/carbon-dco/blob/main/dco.md) before we can accept your contribution. You can sign the DCO by adding a comment below using this text:" - custom-pr-sign-comment: "I have read the DCO document and I hereby sign the DCO." - custom-allsigned-prcomment: "All contributors have signed the DCO." + create-file-commit-message: + 'chore: create file to store dco signatures' + signed-commit-message: + 'chore: $contributorName has signed the dco in #$pullRequestNo' + custom-notsigned-prcomment: + 'Thanks for your submission! We ask that $you sign our [Developer + Certificate of + Origin](https://github.com/carbon-design-system/carbon-dco/blob/main/dco.md) + before we can accept your contribution. You can sign the DCO by + adding a comment below using this text:' + custom-pr-sign-comment: + 'I have read the DCO document and I hereby sign the DCO.' + custom-allsigned-prcomment: 'All contributors have signed the DCO.' lock-pullrequest-aftermerge: false - use-dco-flag: true \ No newline at end of file + use-dco-flag: true diff --git a/.github/workflows/v10-ci.yml b/.github/workflows/v10-ci.yml index 75a8a883d646..d9e49067c616 100644 --- a/.github/workflows/v10-ci.yml +++ b/.github/workflows/v10-ci.yml @@ -6,6 +6,8 @@ on: pull_request: branches: - v10 + merge_group: + types: [checks_requested] concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true diff --git a/.kodiak.toml b/.kodiak.toml deleted file mode 100644 index 8c7026011d46..000000000000 --- a/.kodiak.toml +++ /dev/null @@ -1,7 +0,0 @@ -# .kodiak.toml -version = 1 - -[merge] -automerge_label = ["status: ready to merge 🎉", "status: enable automerge 🟠"] -notify_on_conflict = "false" -method = "squash"