diff --git a/.github/workflows/automerge-cwc-v2.yml b/.github/workflows/automerge-cwc-v2.yml new file mode 100644 index 00000000000..0f522e4a588 --- /dev/null +++ b/.github/workflows/automerge-cwc-v2.yml @@ -0,0 +1,29 @@ +name: automerge-cwc-v2 +on: + push: + branches: + - 'main' + +concurrency: + group: automerge-cwc-v2-${{ github.ref }} + cancel-in-progress: true + +jobs: + automerge-mastheadv2: + if: github.repository == 'carbon-design-system/carbon-for-ibm-dotcom' + runs-on: ubuntu-20.04 + env: + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} + steps: + - uses: actions/checkout@v2 + - name: Merge to feat/cwc-v2 + uses: devmasx/merge-branch@1.4.0 + with: + type: now + target_branch: 'feat/cwc-v2' + env: + GITHUB_TOKEN: ${{secrets.MERGE_ACTION}} + - uses: act10ns/slack@v1 + with: + status: ${{ job.status }} + if: failure() diff --git a/.github/workflows/ci-check.yml b/.github/workflows/ci-check.yml index acf2f8c6d18..2b79ba5da6f 100644 --- a/.github/workflows/ci-check.yml +++ b/.github/workflows/ci-check.yml @@ -2,9 +2,9 @@ name: ci-check on: push: - branches: [ main, release/* ] + branches: [ main, release/*, feat/cwc-v2 ] pull_request: - branches: [ main, release/* ] + branches: [ main, release/*, feat/cwc-v2 ] concurrency: group: ci-check-${{ github.ref }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index dccbc6766dd..f4e366bf2f5 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,7 +13,7 @@ name: "CodeQL" on: push: - branches: [ main, release/* ] + branches: [ main, release/*, feat/cwc-v2 ] pull_request: # The branches below must be a subset of the branches above branches: [ main ] diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 56eedf04cf6..a5a31be62c3 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -2,9 +2,9 @@ name: e2e-tests on: push: - branches: [ main, release/* ] + branches: [ main, release/*, feat/cwc-v2 ] pull_request: - branches: [ main, release/* ] + branches: [ main, release/*, feat/cwc-v2 ] concurrency: group: e2e-tests-${{ github.ref }} diff --git a/.github/workflows/percy-update-base.yml b/.github/workflows/percy-update-base.yml index 3e04e22a36e..5ff7aa412cf 100644 --- a/.github/workflows/percy-update-base.yml +++ b/.github/workflows/percy-update-base.yml @@ -2,7 +2,7 @@ name: percy-update-base on: push: - branches: [ main, release/* ] + branches: [ main, release/*, feat/cwc-v2 ] concurrency: group: percy-update-base-${{ github.ref }}