Skip to content

Commit

Permalink
Merge branch 'main' into issue-15885
Browse files Browse the repository at this point in the history
  • Loading branch information
tw15egan authored Mar 5, 2024
2 parents d236945 + 5e191bb commit 1fd5555
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/add-to-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
name: Add issue with enhancement label to the Proposals project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@31b3f3ccdc584546fc445612dec3f38ff5edb41c #v0.5.0
- uses: actions/add-to-project@0609a2702eefb44781da00f8e04901d6e5cd2b92 #v0.6.0
with:
labeled: ${{ env.LABEL_ENHANCEMENT }}
project-url: ${{ env.PROPOSALS_PROJECT_URL }}
Expand All @@ -29,7 +29,7 @@ jobs:
name: Add issue with typescript label to the TypeScript Adoption project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@31b3f3ccdc584546fc445612dec3f38ff5edb41c #v0.5.0
- uses: actions/add-to-project@0609a2702eefb44781da00f8e04901d6e5cd2b92 #v0.6.0
with:
labeled: ${{ env.LABEL_TYPESCRIPT }}
project-url: ${{ env.TYPESCRIPT_PROJECT_URL }}
Expand All @@ -39,7 +39,7 @@ jobs:
name: Add issue to the Design System project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@31b3f3ccdc584546fc445612dec3f38ff5edb41c #v0.5.0
- uses: actions/add-to-project@0609a2702eefb44781da00f8e04901d6e5cd2b92 #v0.6.0
with:
labeled: ${{ env.LABEL_ENHANCEMENT }}, ${{ env.LABEL_TYPESCRIPT }}
label-operator: NOT
Expand Down
Binary file not shown.
Binary file not shown.
11 changes: 4 additions & 7 deletions docs/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ checkpoints:

### Prerelease

The prerelease occurs on the first Tuesday of a sprint. During this stage, the
The prerelease occurs on the last Monday of a sprint. During this stage, the
release team will need to do the following:

- [ ] Run the
Expand Down Expand Up @@ -121,10 +121,9 @@ To do so, follow the above steps for [Prerelease](#prerelease) but specify

### Stable release

A stable release occurs on the first Thursday of a sprint and finishes on the
morning of the first Friday of a sprint. This should occur after the prerelease
has been tested and validated. During this stage, the release team will do the
following:
A stable release occurs on the last Wednesday and finishes later in the day.
This should occur after the prerelease has been tested and validated. During
this stage, the release team will do the following:

- [ ] Run the
[Version Workflow](https://github.com/carbon-design-system/carbon/actions/workflows/version.yml)
Expand Down Expand Up @@ -162,8 +161,6 @@ git push upstream v11.2.0
- [ ] Verify that this triggers a run of the
[Release Workflow](https://github.com/carbon-design-system/carbon/actions/workflows/release.yml)

**Friday**

The packages that have been published will be switched to latest on the first
Friday of a sprint. To make the switch, you will need to:

Expand Down
2 changes: 1 addition & 1 deletion packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@ibm/telemetry-js": "^1.2.1",
"classnames": "2.5.1",
"copy-to-clipboard": "^3.3.1",
"downshift": "8.3.1",
"downshift": "8.3.2",
"flatpickr": "4.6.13",
"invariant": "^2.2.3",
"lodash.debounce": "^4.0.8",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ application's react tree. Multiple feature flags can be configured at the same
time.

```jsx
import { unstable_FeatureFlags as FeatureFlags } from '@carbon/react';

<FeatureFlags
flags={{
'enable-v12-tile-default-icons': true,
Expand All @@ -63,7 +65,7 @@ entire app, or only certain pages/routes/sections of your application.
```jsx
import { StrictMode } from 'react';
import { createRoot } from 'react-dom/client';
import { FeatureFlags } from '@carbon/react';
import { unstable_FeatureFlags as FeatureFlags } from '@carbon/react';
import App from './App';

const root = createRoot(document.getElementById('root'));
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2085,7 +2085,7 @@ __metadata:
clipboardy: "npm:^2.1.0"
copy-to-clipboard: "npm:^3.3.1"
css-loader: "npm:^6.5.1"
downshift: "npm:8.3.1"
downshift: "npm:8.3.2"
enquirer: "npm:^2.3.6"
fast-glob: "npm:^3.2.7"
flatpickr: "npm:4.6.13"
Expand Down Expand Up @@ -12420,9 +12420,9 @@ __metadata:
languageName: node
linkType: hard

"downshift@npm:8.3.1":
version: 8.3.1
resolution: "downshift@npm:8.3.1"
"downshift@npm:8.3.2":
version: 8.3.2
resolution: "downshift@npm:8.3.2"
dependencies:
"@babel/runtime": "npm:^7.22.15"
compute-scroll-into-view: "npm:^3.0.3"
Expand All @@ -12431,7 +12431,7 @@ __metadata:
tslib: "npm:^2.6.2"
peerDependencies:
react: ">=16.12.0"
checksum: 10/b616da957802bd80bc8d909d36bff851d9701e743d800be6443514f24deeaf0ce22ae56e6802c386c769328d8442969c6629c6f94d99ff12bea8d07e11c86cee
checksum: 10/69066920bbed5af504567ca53262d09bf1c5ca0aeb9ee46319f823d635d7b8a91b836f5a9876113d9ce9f1484636736fc4737a2a421c885fe2063c51de21cb41
languageName: node
linkType: hard

Expand Down

0 comments on commit 1fd5555

Please sign in to comment.