Skip to content

Commit

Permalink
chore(merge): merge feat/carbon-for-ibm-dotcom-v2 into main (#11161)
Browse files Browse the repository at this point in the history
* chore(merge): merge feat/carbon-for-ibm-dotcom-v2 into main
  • Loading branch information
kennylam authored Nov 30, 2023
1 parent e43d645 commit f7fd7e7
Show file tree
Hide file tree
Showing 4,373 changed files with 106,075 additions and 421,213 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 1 addition & 3 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ body:
description: Which package(s) are you using?
multiple: true
options:
- '@carbon/ibmdotcom-react'
- '@carbon/ibmdotcom-web-components'
- '@carbon/web-components'
- '@carbon/ibmdotcom-styles'
Expand All @@ -82,8 +81,7 @@ body:
label: CodeSandbox example
description:
'Our
[Web Components](https://www.ibm.com/standards/carbon/web-components)
and [React](https://www.ibm.com/standards/carbon/react) Storybook documentation includes links to
[Web Components](https://www.ibm.com/standards/carbon/web-components) Storybook documentation includes links to
codesandboxes for each component. Use those to help re-create the issue.'
validations:
required: true
Expand Down
29 changes: 29 additions & 0 deletions .github/workflows/automerge-content-updates.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: automerge-content-updates
on:
push:
branches:
- 'main'

concurrency:
group: automerge-content-updates-${{ github.ref }}
cancel-in-progress: true

jobs:
automerge-content-updates:
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 fix/content-updates
uses: devmasx/[email protected]
with:
type: now
target_branch: 'fix/content-updates'
env:
GITHUB_TOKEN: ${{secrets.MERGE_ACTION}}
- uses: act10ns/slack@v2
with:
status: ${{ job.status }}
if: failure()
29 changes: 29 additions & 0 deletions .github/workflows/automerge-mastheadv2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: automerge-mastheadv2
on:
push:
branches:
- 'main'

concurrency:
group: automerge-mastheadv2-${{ 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@v4
- name: Merge to feat/masthead-v2-dev
uses: devmasx/[email protected]
with:
type: now
target_branch: 'feat/masthead-v2-dev'
env:
GITHUB_TOKEN: ${{secrets.MERGE_ACTION}}
- uses: act10ns/slack@v2
with:
status: ${{ job.status }}
if: failure()
29 changes: 29 additions & 0 deletions .github/workflows/automerge-storybook-controls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: automerge-storybook-controls
on:
push:
branches:
- 'main'

concurrency:
group: automerge-storybook-controls-${{ github.ref }}
cancel-in-progress: true

jobs:
automerge-storybook-controls:
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 feat/storybook-controls
uses: devmasx/[email protected]
with:
type: now
target_branch: 'feat/storybook-controls'
env:
GITHUB_TOKEN: ${{secrets.MERGE_ACTION}}
- uses: act10ns/slack@v2
with:
status: ${{ job.status }}
if: failure()
2 changes: 1 addition & 1 deletion .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: automerge
on:
push:
branches: [ release/v1* ]
branches: [ release/v2* ]

concurrency:
group: automerge-${{ github.ref }}
Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/check-cdn.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: check-cdn (Checks the CDN packages nightly)

on:
schedule:
- cron: '0 1 * * 1-5'

concurrency:
group: check-cdn-${{ github.ref }}
cancel-in-progress: true

jobs:
cypress:
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: 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: Run Cypress tests over the CDN packages
run: yarn test:cdn-build:test
working-directory: packages/web-components
- uses: act10ns/slack@v2
with:
status: ${{ job.status }}
if: failure()
23 changes: 3 additions & 20 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: [ v1 ]
branches: [ main, release/*, feat/*, fix/content-updates ]
pull_request:
branches: [ v1 ]
branches: [ main, release/*, feat/*, fix/content-updates ]

concurrency:
group: ci-check-${{ github.ref }}
Expand Down Expand Up @@ -40,25 +40,8 @@ jobs:
- name: Install dependencies
run: yarn install --immutable --immutable-cache
- name: Build project
run: yarn lerna run --stream --ignore @carbon/ibmdotcom-react build
run: yarn lerna run --stream build
- name: Install xvfb
run: sudo apt-get install xvfb
- name: Run basic checks
run: xvfb-run --auto-servernum yarn lerna run --stream --prefix --verbose --scope=@carbon/ibmdotcom-web-components ci-check
a11y:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- name: Use Node.js 18.x
uses: actions/setup-node@v4
with:
node-version: 18.15
cache: 'yarn'
- name: Install dependencies
run: yarn install --immutable --immutable-cache
- name: Build project
run: yarn build
- name: Install xvfb
run: sudo apt-get install xvfb
- name: Run a11y compliance tests
run: xvfb-run --auto-servernum --error-file=/dev/stderr yarn test:a11y
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [ v1 ]
branches: [ main, release/*, feat/*, fix/content-updates ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ v1 ]
branches: [ main, release/*, feat/*, fix/content-updates ]
schedule:
- cron: '35 16 * * 1'

Expand Down
43 changes: 43 additions & 0 deletions .github/workflows/dependabot-yarn-mirror.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: dependabot-yarn-mirror

on:
push:
branches: [ dependabot/**/* ]
pull_request:
branches: [ dependabot/**/* ]

concurrency:
group: dependabot-yarn-mirror-${{ github.ref }}
cancel-in-progress: true

jobs:
yarn-mirror:
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 || github.token}}
- name: Use Node.js 18.x
uses: actions/setup-node@v4
with:
node-version: '18.x'
cache: 'yarn'
- name: Get branch name
shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
id: get_branch
- name: Install dependencies
run: yarn install --no-immutable --immutable-cache
- name: Push changes
run: |
if [ -z "$(git status --porcelain)" ]; then
echo "Mirror is clean, exiting..."
else
git config --global user.email ${{ secrets.BOT_EMAIL }}
git config --global user.name ${{ secrets.BOT_NAME }}
git add -A
git commit -m "chore(yarn): update yarn offline mirror"
git push origin ${{ steps.get_branch.outputs.branch }}
fi
Loading

0 comments on commit f7fd7e7

Please sign in to comment.