Skip to content

Commit

Permalink
Merge pull request #66 from jenny-s51/add-v6-configs
Browse files Browse the repository at this point in the history
Update CI and semantic release for v6 branch
  • Loading branch information
wise-king-sullyman committed Dec 12, 2023
2 parents c0c51c7 + 8441c94 commit 41c2dbb
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 74 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
pull_request:
branches:
- main
- v4
- v6
jobs:
call-build-lint-test-workflow:
uses: ./.github/workflows/build-lint-test.yml
2 changes: 1 addition & 1 deletion .github/workflows/promote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
push:
# Sequence of patterns matched against refs/tags
tags:
- v5.*
- v6.*
jobs:
build-and-promote:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
push:
branches:
- main
- v4
- v6
jobs:
call-build-lint-test-workflow:
uses: ./.github/workflows/build-lint-test.yml
Expand Down
16 changes: 8 additions & 8 deletions packages/module/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@patternfly/react-user-feedback",
"version": "0.0.0",
"version": "6.0.0-alpha.0",
"description": "A feedback extension to allow users to provide input on products.",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
"publishConfig": {
"access": "public",
"tag": "prerelease"
"tag": "alpha"
},
"scripts": {
"build": "yarn build:js && yarn build:esm && yarn build:fed:packages && yarn copy:files:esm && yarn copy:files:cjs",
Expand Down Expand Up @@ -36,8 +36,8 @@
"@patternfly/react-icons": "^5.0.0"
},
"dependencies": {
"@patternfly/react-core": "^5.0.0",
"@patternfly/react-icons": "^5.0.0"
"@patternfly/react-core": "^6.0.0-alpha.2",
"@patternfly/react-icons": "^6.0.0-alpha.2"
},
"peerDependencies": {
"react": "^17 || ^18",
Expand All @@ -53,10 +53,10 @@
"@types/react": "^18",
"@types/react-dom": "^18",
"@patternfly/patternfly-a11y": "^4.3.1",
"@patternfly/documentation-framework": "^5.0.15",
"@patternfly/patternfly": "^5.0.0",
"@patternfly/react-table": "^5.0.0",
"@patternfly/react-code-editor": "^5.0.0",
"@patternfly/documentation-framework": "^5.3.8",
"@patternfly/patternfly":"^6.0.0-alpha.21",
"@patternfly/react-table": "^6.0.0-alpha.2",
"@patternfly/react-code-editor": "^6.0.0-alpha.2",
"node-sass-package-importer": "^5.3.2",
"fs-extra": "^9.1.0",
"glob": "^7.2.3",
Expand Down
6 changes: 3 additions & 3 deletions packages/module/release.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module.exports = {
branches: [
'do-not-delete',
{ name: 'v4', channel: 'prerelease-v4', range: '4.x' },
{ name: 'main', channel: 'prerelease', prerelease: 'prerelease' }
{ name: 'main', channel: 'alpha', prerelease: 'alpha' },
{ name: 'v6', channel: 'prerelease-v6', range: '6.x' }
],
analyzeCommits: {
preset: 'angular'
Expand All @@ -23,5 +23,5 @@ module.exports = {
'@semantic-release/npm'
],
tagFormat: 'prerelease-v${version}',
dryRun: false
dryRun: true
};
120 changes: 60 additions & 60 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1562,21 +1562,21 @@
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"

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

"@patternfly/documentation-framework@^5.0.15":
version "5.0.15"
resolved "https://registry.yarnpkg.com/@patternfly/documentation-framework/-/documentation-framework-5.0.15.tgz#56e6608de10a95a92787686e5db1eb3ff7c09b89"
integrity sha512-3r9fqPeAKY8GeJM6m7VPyPsiggxhyDbbWTo2/4T4NoNisVPpFXi0AzUaTpvJU2KcBx5pSot1mb84V3f8DHzWXg==
"@patternfly/documentation-framework@^5.3.8":
version "5.3.8"
resolved "https://registry.npmjs.org/@patternfly/documentation-framework/-/documentation-framework-5.3.8.tgz#4eb7dcd8b6e7c3a8b1c4680b1d43d45db114201f"
integrity sha512-RiRaC183RdzbUDcpgkT9ekMcBFLhiBfHnByJMgwyveqR10qcGDezT59Pe3bbHSWP+9ly3eCRIkgGHh8rVkfBQg==
dependencies:
"@babel/core" "7.18.2"
"@babel/plugin-proposal-class-properties" "7.17.12"
Expand All @@ -1586,7 +1586,7 @@
"@babel/plugin-transform-react-jsx" "7.17.12"
"@babel/preset-env" "7.18.2"
"@mdx-js/util" "1.6.16"
"@patternfly/ast-helpers" "^0.4.57"
"@patternfly/ast-helpers" "^1.3.8"
"@reach/router" "npm:@gatsbyjs/reach-router@1.3.9"
autoprefixer "9.8.6"
babel-loader "9.1.2"
Expand Down Expand Up @@ -1662,60 +1662,60 @@
puppeteer-cluster "^0.23.0"
xmldoc "^1.1.2"

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

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

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

"@patternfly/react-icons@^5.0.0":
version "5.0.0"
resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-5.0.0.tgz#bb56ead97425f1b3ab886ee291ba6b6af4088e9d"
integrity sha512-GG5Y/UYl0h346MyDU9U650Csaq4Mxk8S6U8XC7ERk/xIrRr2RF67O2uY7zKBDMTNLYdBvPzgc2s3OMV1+d2/mg==

"@patternfly/react-styles@^5.0.0":
version "5.0.0"
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-5.0.0.tgz#63705ad498ff271fd056e92bd07b2c720ef3491a"
integrity sha512-xbSCgjx+fPrXbIzUznwTFWtJEbzVS0Wn4zrejdKJYQTY+4YcuPlFkeq2tl3syzwGsaYMpHiFwQiTaKyTvlwtuw==

"@patternfly/react-table@^5.0.0":
version "5.0.0"
resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-5.0.0.tgz#2808f22d01818c31e6ddc69cc3a07c9381dc6d84"
integrity sha512-Q3MBo9+ZmBvLJzVHxmV9f/4qQAz5Si743zVLHRwjh+tjbn/DrcbxJdT8Uxa3NGKkpvszzgi/LPeXipJOHOELug==
dependencies:
"@patternfly/react-core" "^5.0.0"
"@patternfly/react-icons" "^5.0.0"
"@patternfly/react-styles" "^5.0.0"
"@patternfly/react-tokens" "^5.0.0"
"@patternfly/react-icons@^6.0.0-alpha.2":
version "6.0.0-alpha.2"
resolved "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-6.0.0-alpha.2.tgz#7555a1410a6038c7c59f2f8d515adec572392f86"
integrity sha512-OGBen2niZ5S88rY2DVeO+P06oaZP5cO5MmdgW7iOzhVuyHkUS+IB15bN7+RxO9PJkEpfMQz0Ui/rQaXFGxLaSw==

"@patternfly/react-styles@^6.0.0-alpha.2":
version "6.0.0-alpha.2"
resolved "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-6.0.0-alpha.2.tgz#0d2973b1c8e42e2f35f208874f12c754f0c2a8b0"
integrity sha512-39VT5sKQdxck48mjSgbiL9gn6SaaVuYrlqQcrkpRB4F7qk0rJdVAdjwS/PliRjsb/Ywz7xG9UWK/D/1OoQEf2A==

"@patternfly/react-table@^6.0.0-alpha.2":
version "6.0.0-alpha.2"
resolved "https://registry.npmjs.org/@patternfly/react-table/-/react-table-6.0.0-alpha.2.tgz#c454750020518ad8f234d8f630c26f4114c0e249"
integrity sha512-jbyC/JS4F8NifKhdQ7N08ncD2XUoswjDrORoi354Vw+luvS1e+OlcPTCniJZkJP4YlkdeKROTHHe1aJle80BWw==
dependencies:
"@patternfly/react-core" "^6.0.0-alpha.2"
"@patternfly/react-icons" "^6.0.0-alpha.2"
"@patternfly/react-styles" "^6.0.0-alpha.2"
"@patternfly/react-tokens" "^6.0.0-alpha.2"
lodash "^4.17.19"
tslib "^2.5.0"

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

"@polka/url@^1.0.0-next.20":
version "1.0.0-next.21"
Expand Down Expand Up @@ -5352,12 +5352,12 @@ flush-write-stream@^1.0.0:
inherits "^2.0.3"
readable-stream "^2.3.6"

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

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

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

tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
version "2.2.1"
Expand Down

0 comments on commit 41c2dbb

Please sign in to comment.