Skip to content

Commit

Permalink
Merge branch 'main' into feat/pictogram-links
Browse files Browse the repository at this point in the history
  • Loading branch information
m4olivei committed Dec 13, 2023
2 parents c54af43 + 4a43a1a commit 7e421f9
Show file tree
Hide file tree
Showing 658 changed files with 1,892 additions and 3,138 deletions.
28 changes: 28 additions & 0 deletions .github/workflows/automerge-cwc-releases.yml
Original file line number Diff line number Diff line change
@@ -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/[email protected]
with:
type: now
target_branch: 'main'
env:
GITHUB_TOKEN: ${{secrets.MERGE_ACTION}}
- uses: act10ns/slack@v2
with:
status: ${{ job.status }}
if: failure()
4 changes: 2 additions & 2 deletions .github/workflows/ci-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: ci-check

on:
push:
branches: [ main, release/*, feat/*, fix/content-updates ]
branches: [ main, release/v2*, feat/*, fix/content-updates ]
pull_request:
branches: [ main, release/*, feat/*, fix/content-updates ]
branches: [ main, release/v2*, feat/*, fix/content-updates ]

concurrency:
group: ci-check-${{ github.ref }}
Expand Down
69 changes: 69 additions & 0 deletions .github/workflows/deploy-cwc-next.yml
Original file line number Diff line number Diff line change
@@ -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 }}
2 changes: 1 addition & 1 deletion .github/workflows/deploy-next.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
KALTURA_PARTNER_ID: ${{ secrets.KALTURA_PARTNER_ID }}
KALTURA_UICONF_ID: ${{ secrets.KALTURA_UICONF_ID }}
PROFILE_HOST: ${{ secrets.PROFILE_HOST }}
DDS_FLAGS_ALL: true
C4D_FLAGS_ALL: true
- name: Building @carbon/ibmdotcom-web-components react wrapper storybook
run: yarn build-storybook:react
working-directory: packages/web-components
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: e2e-integration

on:
push:
branches: [ main, release/*, feat/masthead-v2, feat/masthead-v2-dev ]
branches: [ main, release/v2*, feat/masthead-v2, feat/masthead-v2-dev ]
schedule:
- cron: '0 20 * * 1-5'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-tests-parallel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: e2e-tests-parallel

on:
push:
branches: [ main, release/*, feat/*, fix/content-updates ]
branches: [ main, release/v2*, feat/*, fix/content-updates ]
pull_request:
branches: [ main, release/*, feat/*, fix/content-updates ]
branches: [ main, release/v2*, feat/*, fix/content-updates ]

concurrency:
group: e2e-tests-parallel${{ github.ref }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: e2e-tests

on:
push:
branches: [ main, release/*, feat/*, fix/content-updates ]
branches: [ main, release/v2*, feat/*, fix/content-updates ]
pull_request:
branches: [ main, release/*, feat/*, fix/content-updates ]
branches: [ main, release/v2*, feat/*, fix/content-updates ]

concurrency:
group: e2e-tests-${{ github.ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/percy-update-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: percy-update-base

on:
push:
branches: [ main, release/*, feat/*, fix/content-updates ]
branches: [ main, release/v2*, feat/*, fix/content-updates ]

concurrency:
group: percy-update-base-${{ github.ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-preflight.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches:
- main
- release/*
- release/v2*

concurrency:
group: release-preflight-${{ github.ref }}
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 7e421f9

Please sign in to comment.