Skip to content

Commit

Permalink
chore(workflows): update workflows to be compatible with GH merge que…
Browse files Browse the repository at this point in the history
…ue (#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>
  • Loading branch information
tay1orjones and kodiakhq[bot] committed Jul 14, 2023
1 parent e0382e6 commit 77020b0
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 21 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/add-to-merge-queue.yml
Original file line number Diff line number Diff line change
@@ -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 }}
8 changes: 6 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ on:
pull_request:
branches:
- main
merge_group:
types: [checks_requested]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
branches: [main, v10]
pull_request:
branches: [main, v10]
merge_group:
types: [checks_requested]
schedule:
- cron: '0 12 * * 1'

Expand Down
37 changes: 25 additions & 12 deletions .github/workflows/dco.yml
Original file line number Diff line number Diff line change
@@ -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
use-dco-flag: true
2 changes: 2 additions & 0 deletions .github/workflows/v10-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ on:
pull_request:
branches:
- v10
merge_group:
types: [checks_requested]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down
7 changes: 0 additions & 7 deletions .kodiak.toml

This file was deleted.

0 comments on commit 77020b0

Please sign in to comment.