Skip to content

Commit bb56d23

Browse files
authored
Merge branch 'next' into tooltip-access-next
2 parents e4a085b + 1c5ba27 commit bb56d23

36 files changed

+739
-432
lines changed

.github/CONTRIBUTING.md

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Want to contribute to this repository? Please read below first:
1010
* [Coding Standards](#coding-standards)
1111
* [Commit Message Guidelines](#commit-message-guidlines)
1212
* [Testing](#testing)
13+
* [Legal](#legal)
1314

1415
## IBMers Contributing
1516

@@ -90,7 +91,7 @@ If your issue appears to be a bug, and hasn't been reported, open a new issue. H
9091
6. Commit your changes using a descriptive commit message.
9192

9293
```
93-
$ git commit -a -m "chore: Update header with newest designs, resolves #123"
94+
$ git commit -a -m -s "chore: Update header with newest designs, resolves #123"
9495
```
9596

9697
**Note:** the optional commit -a command line option will automatically "add" and "rm" edited files. See [Close a commit via commit message](https://help.github.com/articles/closing-issues-via-commit-messages/) and [writing good commit messages](https://github.com/erlang/otp/wiki/Writing-good-commit-messages) for more details on commit messages.
@@ -158,3 +159,38 @@ Test your changes by running our test commands:
158159
```
159160
npm run test:watch
160161
```
162+
163+
## Legal
164+
165+
Each source file must include a license header for the Apache
166+
Software License 2.0. Using the SPDX format is the simplest approach.
167+
For example:
168+
169+
```javascript
170+
/*
171+
Copyright <holder> All Rights Reserved.
172+
SPDX-License-Identifier: Apache-2.0
173+
*/
174+
```
175+
176+
We have tried to make it as easy as possible to make contributions. This
177+
applies to how we handle the legal aspects of contribution. We use the
178+
same approach - the [Developer's Certificate of Origin 1.1 (DCO)][DCO] - that the Linux® Kernel [community](https://elinux.org/Developer_Certificate_Of_Origin)
179+
uses to manage code contributions.
180+
181+
We simply ask that when submitting a patch for review, the developer
182+
must include a sign-off statement in the commit message.
183+
184+
Here is an example Signed-off-by line, which indicates that the
185+
submitter accepts the DCO:
186+
187+
```text
188+
Signed-off-by: John Doe <[email protected]>
189+
```
190+
191+
You can include this automatically when you commit a change to your
192+
local git repository using the following command:
193+
194+
```bash
195+
git commit -s
196+
```

.github/workflows/check-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Check build
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ master, next ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ master, next ]
88

99
jobs:
1010
build:
@@ -41,7 +41,7 @@ jobs:
4141

4242
strategy:
4343
matrix:
44-
angular-version: [7, 8, 9, 10, 11, 12, 13, 14]
44+
angular-version: [12, 13, 14]
4545
node-version: [14.x]
4646

4747
steps:

.github/workflows/dco.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: 'DCO Assistant'
2+
on:
3+
issue_comment:
4+
types: [created]
5+
pull_request_target:
6+
types: [opened, closed, synchronize]
7+
8+
jobs:
9+
DCO:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: 'DCO Assistant'
13+
if:
14+
(github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the
15+
DCO document and I hereby sign the DCO.') || github.event_name == 'pull_request_target'
16+
uses: cla-assistant/[email protected]
17+
env:
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
19+
PERSONAL_ACCESS_TOKEN: ${{ secrets.CARBON_BOT_DCO }}
20+
with:
21+
path-to-signatures: 'dco-signatures.json'
22+
path-to-document: 'https://github.com/carbon-design-system/carbon-dco/blob/main/dco.md'
23+
branch: 'main'
24+
allowlist: bot*
25+
remote-organization-name: carbon-design-system
26+
remote-repository-name: carbon-dco
27+
create-file-commit-message: 'chore: create file to store dco signatures'
28+
signed-commit-message: 'chore: $contributorName has signed the dco in #$pullRequestNo'
29+
custom-notsigned-prcomment:
30+
'Thanks for your submission! We ask that $you sign our [Developer Certificate of
31+
Origin](https://github.com/carbon-design-system/carbon-dco/blob/main/dco.md) before we
32+
can accept your contribution. You can sign the DCO by adding a comment below using this
33+
text:'
34+
custom-pr-sign-comment: 'I have read the DCO document and I hereby sign the DCO.'
35+
custom-allsigned-prcomment: 'All contributors have signed the DCO.'
36+
lock-pullrequest-aftermerge: false
37+
use-dco-flag: true

.github/workflows/publish.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Deploy
2+
3+
on:
4+
# Runs on pushes targeting release branches
5+
push:
6+
branches: ["master", "next", "v3", "v9"]
7+
8+
# Allows us to run this workflow manually from the Actions tab
9+
workflow_dispatch:
10+
11+
jobs:
12+
# Single deploy job since we're just deploying
13+
publish:
14+
environment:
15+
name: Deploy
16+
runs-on: ubuntu-latest
17+
steps:
18+
# Checkout to branch
19+
- name: Checkout
20+
uses: actions/checkout@v3
21+
22+
# Set up node to use v14
23+
- name: Setup Node
24+
uses: actions/setup-node@v3
25+
with:
26+
node-version: "14"
27+
cache: "npm"
28+
cache-dependency-path: "package-lock.json"
29+
30+
- name: Install packages
31+
run: npm i
32+
33+
# Build CCA package
34+
- name: Build package
35+
run: npm run build
36+
37+
# Run Semantic release to publish package to NPM
38+
- name: Publish package
39+
env:
40+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
41+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
42+
run: npm run semantic-release
43+
44+
# Push storybook build to gh-pages branch if pushed to `master` branch
45+
- name: Serve storybook
46+
if: github.ref_name == 'master'
47+
env:
48+
GH_TOKEN: ${{ secrets.CARBON_BOT_DCO }}
49+
run: ./scripts/deploy.sh
50+
shell: bash

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @IBM/carbon-angular
1+
* @carbon-design-system/angular-maintainers

integration/ng13/package-lock.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

integration/ng14/package-lock.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)