From ae8bc17cd86eb86ae4cd0cf4d0066ea52027c650 Mon Sep 17 00:00:00 2001
From: ariellalgilmore <ariellalgilmore@gmail.com>
Date: Tue, 12 Dec 2023 09:10:47 -0800
Subject: [PATCH 1/2] chore(cwc): bump 2.1.0-rc.0

---
 packages/carbon-web-components/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/carbon-web-components/package.json b/packages/carbon-web-components/package.json
index 2b6de897776..0ff2d3f7666 100644
--- a/packages/carbon-web-components/package.json
+++ b/packages/carbon-web-components/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/web-components",
   "private": true,
-  "version": "2.0.2-rc.1",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },

From 764412e6533030f6fb1ef0728996ccd49b43b027 Mon Sep 17 00:00:00 2001
From: Ariella Gilmore <ariellalgilmore@gmail.com>
Date: Tue, 12 Dec 2023 10:03:14 -0800
Subject: [PATCH 2/2] chore(cwc): add automerge and next storybook (#11220)

* chore(cwc): add automerge for main

* feat(cwc): deploy next storybook
---
 .github/workflows/automerge-cwc-releases.yml | 28 ++++++++
 .github/workflows/deploy-cwc-next.yml        | 69 ++++++++++++++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 .github/workflows/automerge-cwc-releases.yml
 create mode 100644 .github/workflows/deploy-cwc-next.yml

diff --git a/.github/workflows/automerge-cwc-releases.yml b/.github/workflows/automerge-cwc-releases.yml
new file mode 100644
index 00000000000..79cf7779c83
--- /dev/null
+++ b/.github/workflows/automerge-cwc-releases.yml
@@ -0,0 +1,28 @@
+name: automerge-cwc
+on:
+  push:
+    branches: [ release-cwc/* ]
+
+concurrency:
+  group: automerge-cwc-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  automerge-cwc:
+    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@v4
+      - name: Merge to main
+        uses: devmasx/merge-branch@1.4.0
+        with:
+          type: now
+          target_branch: 'main'
+        env:
+          GITHUB_TOKEN: ${{secrets.MERGE_ACTION}}
+      - uses: act10ns/slack@v2
+        with:
+          status: ${{ job.status }}
+        if: failure()
diff --git a/.github/workflows/deploy-cwc-next.yml b/.github/workflows/deploy-cwc-next.yml
new file mode 100644
index 00000000000..20aff9f1ecd
--- /dev/null
+++ b/.github/workflows/deploy-cwc-next.yml
@@ -0,0 +1,69 @@
+name: deploy-cwc-next (Deploy storybook environments to Github Pages)
+
+on:
+  push:
+    branches:
+      - release-cwc/*
+
+concurrency:
+  group: deploy-cwc-next-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  carbon-web-components:
+    if: github.repository == 'carbon-design-system/carbon-for-ibm-dotcom'
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          token: ${{secrets.MERGE_ACTION}}
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18.x'
+          cache: 'yarn'
+      - name: Install dependencies
+        run: yarn install --immutable --immutable-cache
+      - name: Build project
+        run: yarn lerna run --scope @carbon/web-components build
+
+      - name: Set env vars
+        uses: ./.github/actions/set-dotenv
+        with:
+          env-file: packages/carbon-web-components/.env
+        env:
+          KALTURA_PARTNER_ID: ${{ secrets.KALTURA_PARTNER_ID }}
+          KALTURA_UICONF_ID: ${{ secrets.KALTURA_UICONF_ID }}
+          PROFILE_HOST: ${{ secrets.PROFILE_HOST }}
+      - name: Building @carbon/web-components (next) storybook
+        run: yarn build-storybook
+        working-directory: packages/carbon-web-components
+      - name: Move storybook to build folder
+        run: |
+          rm packages/carbon-web-components/.env
+          mkdir -p builds
+          mv packages/carbon-web-components/storybook-static builds/carbon-web-components
+
+      - name: Deploying @carbon/web-components (next) storybook to Github Pages
+        run: |
+          git config --global user.email ${{ secrets.BOT_EMAIL }}
+          git config --global user.name ${{ secrets.BOT_NAME }}
+
+          git fetch origin gh-pages
+          git checkout -b gh-pages origin/gh-pages
+          git update-ref -d refs/remotes/origin/gh-pages
+          git pull origin gh-pages
+
+          rm -rf next/carbon-web-components
+          mkdir -p next
+          mv builds/carbon-web-components next/carbon-web-components
+
+          git add next/carbon-web-components
+          git commit -m "chore(deploy): deploy Carbon web components next to GitHub Pages"
+          git push origin gh-pages
+      - uses: act10ns/slack@v2
+        if: failure()
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        with:
+          status: ${{ job.status }}
\ No newline at end of file