Skip to content

Commit 41c2dbb

Browse files
wise-king-sullymanwise-king-sullyman
authored
Merge pull request #66 from jenny-s51/add-v6-configs
Update CI and semantic release for v6 branch
2 parents c0c51c7 + 8441c94 commit 41c2dbb

6 files changed

Lines changed: 74 additions & 74 deletions

File tree

‎.github/workflows/check-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
pull_request:
44
branches:
55
- main
6-
- v4
6+
- v6
77
jobs:
88
call-build-lint-test-workflow:
99
uses: ./.github/workflows/build-lint-test.yml

‎.github/workflows/promote.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
push:
44
# Sequence of patterns matched against refs/tags
55
tags:
6-
- v5.*
6+
- v6.*
77
jobs:
88
build-and-promote:
99
runs-on: ubuntu-latest

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
push:
44
branches:
55
- main
6-
- v4
6+
- v6
77
jobs:
88
call-build-lint-test-workflow:
99
uses: ./.github/workflows/build-lint-test.yml

‎packages/module/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "@patternfly/react-user-feedback",
3-
"version": "0.0.0",
3+
"version": "6.0.0-alpha.0",
44
"description": "A feedback extension to allow users to provide input on products.",
55
"main": "dist/esm/index.js",
66
"module": "dist/esm/index.js",
77
"publishConfig": {
88
"access": "public",
9-
"tag": "prerelease"
9+
"tag": "alpha"
1010
},
1111
"scripts": {
1212
"build": "yarn build:js && yarn build:esm && yarn build:fed:packages && yarn copy:files:esm && yarn copy:files:cjs",
@@ -36,8 +36,8 @@
3636
"@patternfly/react-icons": "^5.0.0"
3737
},
3838
"dependencies": {
39-
"@patternfly/react-core": "^5.0.0",
40-
"@patternfly/react-icons": "^5.0.0"
39+
"@patternfly/react-core": "^6.0.0-alpha.2",
40+
"@patternfly/react-icons": "^6.0.0-alpha.2"
4141
},
4242
"peerDependencies": {
4343
"react": "^17 || ^18",
@@ -53,10 +53,10 @@
5353
"@types/react": "^18",
5454
"@types/react-dom": "^18",
5555
"@patternfly/patternfly-a11y": "^4.3.1",
56-
"@patternfly/documentation-framework": "^5.0.15",
57-
"@patternfly/patternfly": "^5.0.0",
58-
"@patternfly/react-table": "^5.0.0",
59-
"@patternfly/react-code-editor": "^5.0.0",
56+
"@patternfly/documentation-framework": "^5.3.8",
57+
"@patternfly/patternfly":"^6.0.0-alpha.21",
58+
"@patternfly/react-table": "^6.0.0-alpha.2",
59+
"@patternfly/react-code-editor": "^6.0.0-alpha.2",
6060
"node-sass-package-importer": "^5.3.2",
6161
"fs-extra": "^9.1.0",
6262
"glob": "^7.2.3",

‎packages/module/release.config.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module.exports = {
22
branches: [
33
'do-not-delete',
4-
{ name: 'v4', channel: 'prerelease-v4', range: '4.x' },
5-
{ name: 'main', channel: 'prerelease', prerelease: 'prerelease' }
4+
{ name: 'main', channel: 'alpha', prerelease: 'alpha' },
5+
{ name: 'v6', channel: 'prerelease-v6', range: '6.x' }
66
],
77
analyzeCommits: {
88
preset: 'angular'
@@ -23,5 +23,5 @@ module.exports = {
2323
'@semantic-release/npm'
2424
],
2525
tagFormat: 'prerelease-v${version}',
26-
dryRun: false
26+
dryRun: true
2727
};

‎yarn.lock‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1562,21 +1562,21 @@
15621562
"@nodelib/fs.scandir" "2.1.5"
15631563
fastq "^1.6.0"
15641564

1565-
"@patternfly/ast-helpers@^0.4.57":
1566-
version "0.4.79"
1567-
resolved "https://registry.yarnpkg.com/@patternfly/ast-helpers/-/ast-helpers-0.4.79.tgz#7d738323681d5a1138d973b1daf534f1a05080b2"
1568-
integrity sha512-Nn2Uut7Z1nQwDr5LAf1bns6yCFQFQWwXE2I1Ucvbk6s2Gl2X/85VGvww8FVO+YiW/plLZMLBFRPJMP4fs2N8Cg==
1565+
"@patternfly/ast-helpers@^1.3.8":
1566+
version "1.3.8"
1567+
resolved "https://registry.npmjs.org/@patternfly/ast-helpers/-/ast-helpers-1.3.8.tgz#2575b67f3a051e21fff05d38236771de5939622c"
1568+
integrity sha512-68cpY/Q/ZIjWzs/pDiG7Jg2BhuPiA36vAlF9wi7qdGaFJTrZGmaosm7whbzpL0TFJZFKDmFYID50EnYzHZOI8w==
15691569
dependencies:
15701570
acorn "^8.4.1"
15711571
acorn-class-fields "^1.0.0"
15721572
acorn-jsx "^5.3.2"
15731573
acorn-static-class-features "^1.0.0"
15741574
astring "^1.7.5"
15751575

1576-
"@patternfly/documentation-framework@^5.0.15":
1577-
version "5.0.15"
1578-
resolved "https://registry.yarnpkg.com/@patternfly/documentation-framework/-/documentation-framework-5.0.15.tgz#56e6608de10a95a92787686e5db1eb3ff7c09b89"
1579-
integrity sha512-3r9fqPeAKY8GeJM6m7VPyPsiggxhyDbbWTo2/4T4NoNisVPpFXi0AzUaTpvJU2KcBx5pSot1mb84V3f8DHzWXg==
1576+
"@patternfly/documentation-framework@^5.3.8":
1577+
version "5.3.8"
1578+
resolved "https://registry.npmjs.org/@patternfly/documentation-framework/-/documentation-framework-5.3.8.tgz#4eb7dcd8b6e7c3a8b1c4680b1d43d45db114201f"
1579+
integrity sha512-RiRaC183RdzbUDcpgkT9ekMcBFLhiBfHnByJMgwyveqR10qcGDezT59Pe3bbHSWP+9ly3eCRIkgGHh8rVkfBQg==
15801580
dependencies:
15811581
"@babel/core" "7.18.2"
15821582
"@babel/plugin-proposal-class-properties" "7.17.12"
@@ -1586,7 +1586,7 @@
15861586
"@babel/plugin-transform-react-jsx" "7.17.12"
15871587
"@babel/preset-env" "7.18.2"
15881588
"@mdx-js/util" "1.6.16"
1589-
"@patternfly/ast-helpers" "^0.4.57"
1589+
"@patternfly/ast-helpers" "^1.3.8"
15901590
"@reach/router" "npm:@gatsbyjs/reach-router@1.3.9"
15911591
autoprefixer "9.8.6"
15921592
babel-loader "9.1.2"
@@ -1662,60 +1662,60 @@
16621662
puppeteer-cluster "^0.23.0"
16631663
xmldoc "^1.1.2"
16641664

1665-
"@patternfly/patternfly@^5.0.0":
1666-
version "5.0.2"
1667-
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.0.2.tgz#f5daf2c98ccb85e6466d42fd61d39ba3c10ed532"
1668-
integrity sha512-PB8+MLdYVgF1hIOxGmnVsZG+YHUX3RePe5W1oMS4gS00EmSgw1cobr1Qbpy/BqqS8/R9DRN4hZ2FKDT0d5tkFQ==
1665+
"@patternfly/patternfly@^6.0.0-alpha.21":
1666+
version "6.0.0-alpha.23"
1667+
resolved "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-6.0.0-alpha.23.tgz#75d96c445c08200ffcd74aebdc221334f1d0cc13"
1668+
integrity sha512-h1BRJkZkdTRzg0w1Q66axH1R3hEQM/f2UfKg4H/r8JmP8sRgpshOx2eSMfAask+dqWMJIM/r82fCsNxaDLW/9Q==
16691669

1670-
"@patternfly/react-code-editor@^5.0.0":
1671-
version "5.0.0"
1672-
resolved "https://registry.yarnpkg.com/@patternfly/react-code-editor/-/react-code-editor-5.0.0.tgz#2ba9d49a84023907b94fcbec13ec62b2d463d33e"
1673-
integrity sha512-Ya1nuw2Zcor/MET+s0+VuYq2VsRb+VzKpZQ8Y1MbrXJdlWV6QS5Wf1M7jDl9lYkiJaS3pjG7eXNeVX2YJ+mQiw==
1670+
"@patternfly/react-code-editor@^6.0.0-alpha.2":
1671+
version "6.0.0-alpha.2"
1672+
resolved "https://registry.npmjs.org/@patternfly/react-code-editor/-/react-code-editor-6.0.0-alpha.2.tgz#96a03ab9218a20fcf63f96f2a1c981f722fe5500"
1673+
integrity sha512-YN10UNzVldVk/k93ndX+lXhPQNsh5Psgn+FGTYLMLN8ZlgjtwOPCxWmwj6eseYEvGCdA5QmaN8UjDCY089ieOg==
16741674
dependencies:
1675-
"@patternfly/react-core" "^5.0.0"
1676-
"@patternfly/react-icons" "^5.0.0"
1677-
"@patternfly/react-styles" "^5.0.0"
1675+
"@patternfly/react-core" "^6.0.0-alpha.2"
1676+
"@patternfly/react-icons" "^6.0.0-alpha.2"
1677+
"@patternfly/react-styles" "^6.0.0-alpha.2"
16781678
react-dropzone "14.2.3"
16791679
tslib "^2.5.0"
16801680

1681-
"@patternfly/react-core@^5.0.0":
1682-
version "5.0.0"
1683-
resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-5.0.0.tgz#96c9e2315047eec94d28f5621c02fa147182dd6f"
1684-
integrity sha512-kewRVFhLw0Dvt8250pqrO47sVRx8E93sMGZbHQomJnZdachYeQ9STnQTP2gvOBq/GPnMei0LZLv0T99g8mPE4w==
1681+
"@patternfly/react-core@^6.0.0-alpha.2":
1682+
version "6.0.0-alpha.2"
1683+
resolved "https://registry.npmjs.org/@patternfly/react-core/-/react-core-6.0.0-alpha.2.tgz#038f5d9f32536bba057c4a0c3f80b31eb7e0bd9b"
1684+
integrity sha512-1AnOI3ZmjBtAh97+aDNCmEgE/7LvUGu3MB3BYJkYFWXz8CIKCrurc3k3e3gCAVdg0oNXhcoSpUsjXnS4/e7qkA==
16851685
dependencies:
1686-
"@patternfly/react-icons" "^5.0.0"
1687-
"@patternfly/react-styles" "^5.0.0"
1688-
"@patternfly/react-tokens" "^5.0.0"
1689-
focus-trap "7.4.3"
1686+
"@patternfly/react-icons" "^6.0.0-alpha.2"
1687+
"@patternfly/react-styles" "^6.0.0-alpha.2"
1688+
"@patternfly/react-tokens" "^6.0.0-alpha.2"
1689+
focus-trap "7.5.2"
16901690
react-dropzone "^14.2.3"
16911691
tslib "^2.5.0"
16921692

1693-
"@patternfly/react-icons@^5.0.0":
1694-
version "5.0.0"
1695-
resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-5.0.0.tgz#bb56ead97425f1b3ab886ee291ba6b6af4088e9d"
1696-
integrity sha512-GG5Y/UYl0h346MyDU9U650Csaq4Mxk8S6U8XC7ERk/xIrRr2RF67O2uY7zKBDMTNLYdBvPzgc2s3OMV1+d2/mg==
1697-
1698-
"@patternfly/react-styles@^5.0.0":
1699-
version "5.0.0"
1700-
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-5.0.0.tgz#63705ad498ff271fd056e92bd07b2c720ef3491a"
1701-
integrity sha512-xbSCgjx+fPrXbIzUznwTFWtJEbzVS0Wn4zrejdKJYQTY+4YcuPlFkeq2tl3syzwGsaYMpHiFwQiTaKyTvlwtuw==
1702-
1703-
"@patternfly/react-table@^5.0.0":
1704-
version "5.0.0"
1705-
resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-5.0.0.tgz#2808f22d01818c31e6ddc69cc3a07c9381dc6d84"
1706-
integrity sha512-Q3MBo9+ZmBvLJzVHxmV9f/4qQAz5Si743zVLHRwjh+tjbn/DrcbxJdT8Uxa3NGKkpvszzgi/LPeXipJOHOELug==
1707-
dependencies:
1708-
"@patternfly/react-core" "^5.0.0"
1709-
"@patternfly/react-icons" "^5.0.0"
1710-
"@patternfly/react-styles" "^5.0.0"
1711-
"@patternfly/react-tokens" "^5.0.0"
1693+
"@patternfly/react-icons@^6.0.0-alpha.2":
1694+
version "6.0.0-alpha.2"
1695+
resolved "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-6.0.0-alpha.2.tgz#7555a1410a6038c7c59f2f8d515adec572392f86"
1696+
integrity sha512-OGBen2niZ5S88rY2DVeO+P06oaZP5cO5MmdgW7iOzhVuyHkUS+IB15bN7+RxO9PJkEpfMQz0Ui/rQaXFGxLaSw==
1697+
1698+
"@patternfly/react-styles@^6.0.0-alpha.2":
1699+
version "6.0.0-alpha.2"
1700+
resolved "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-6.0.0-alpha.2.tgz#0d2973b1c8e42e2f35f208874f12c754f0c2a8b0"
1701+
integrity sha512-39VT5sKQdxck48mjSgbiL9gn6SaaVuYrlqQcrkpRB4F7qk0rJdVAdjwS/PliRjsb/Ywz7xG9UWK/D/1OoQEf2A==
1702+
1703+
"@patternfly/react-table@^6.0.0-alpha.2":
1704+
version "6.0.0-alpha.2"
1705+
resolved "https://registry.npmjs.org/@patternfly/react-table/-/react-table-6.0.0-alpha.2.tgz#c454750020518ad8f234d8f630c26f4114c0e249"
1706+
integrity sha512-jbyC/JS4F8NifKhdQ7N08ncD2XUoswjDrORoi354Vw+luvS1e+OlcPTCniJZkJP4YlkdeKROTHHe1aJle80BWw==
1707+
dependencies:
1708+
"@patternfly/react-core" "^6.0.0-alpha.2"
1709+
"@patternfly/react-icons" "^6.0.0-alpha.2"
1710+
"@patternfly/react-styles" "^6.0.0-alpha.2"
1711+
"@patternfly/react-tokens" "^6.0.0-alpha.2"
17121712
lodash "^4.17.19"
17131713
tslib "^2.5.0"
17141714

1715-
"@patternfly/react-tokens@^5.0.0":
1716-
version "5.0.0"
1717-
resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-5.0.0.tgz#8e2698d32d5353359e713312687a6b08ead0080b"
1718-
integrity sha512-to2CXIZ6WTuzBcjLZ+nXi5LhnYkSIDu3RBMRZwrplmECOoUWv87CC+2T0EVxtASRtpQfikjD2PDKMsif5i0BxQ==
1715+
"@patternfly/react-tokens@^6.0.0-alpha.2":
1716+
version "6.0.0-alpha.2"
1717+
resolved "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-6.0.0-alpha.2.tgz#d0509f67638fa244ae91175b0e308f7935b4ec91"
1718+
integrity sha512-A4CN2WLUzjpHD2WAOexYG9X+yy5fowZXmUpLX87+Gk+sl5ziYOFY661l6b+ZgWmvNZ+g58K75JKb8Myu3bx7Ow==
17191719

17201720
"@polka/url@^1.0.0-next.20":
17211721
version "1.0.0-next.21"
@@ -5352,12 +5352,12 @@ flush-write-stream@^1.0.0:
53525352
inherits "^2.0.3"
53535353
readable-stream "^2.3.6"
53545354

5355-
focus-trap@7.4.3:
5356-
version "7.4.3"
5357-
resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-7.4.3.tgz#a3dae73d44df359eb92bbf37b18e173e813b16c5"
5358-
integrity sha512-BgSSbK4GPnS2VbtZ50VtOv1Sti6DIkj3+LkVjiWMNjLeAp1SH1UlLx3ULu/DCu4vq5R4/uvTm+zrvsMsuYmGLg==
5355+
focus-trap@7.5.2:
5356+
version "7.5.2"
5357+
resolved "https://registry.npmjs.org/focus-trap/-/focus-trap-7.5.2.tgz#e5ee678d10a18651f2591ffb66c949fb098d57cf"
5358+
integrity sha512-p6vGNNWLDGwJCiEjkSK6oERj/hEyI9ITsSwIUICBoKLlWiTWXJRfQibCwcoi50rTZdbi87qDtUlMCmQwsGSgPw==
53595359
dependencies:
5360-
tabbable "^6.1.2"
5360+
tabbable "^6.2.0"
53615361

53625362
follow-redirects@1.5.10:
53635363
version "1.5.10"
@@ -10513,10 +10513,10 @@ symbol-tree@^3.2.4:
1051310513
resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
1051410514
integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
1051510515

10516-
tabbable@^6.1.2:
10517-
version "6.1.2"
10518-
resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.1.2.tgz#b0d3ca81d582d48a80f71b267d1434b1469a3703"
10519-
integrity sha512-qCN98uP7i9z0fIS4amQ5zbGBOq+OSigYeGvPy7NDk8Y9yncqDZ9pRPgfsc2PJIVM9RrJj7GIfuRgmjoUU9zTHQ==
10516+
tabbable@^6.2.0:
10517+
version "6.2.0"
10518+
resolved "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97"
10519+
integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==
1052010520

1052110521
tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
1052210522
version "2.2.1"

0 commit comments

Comments
 (0)