Skip to content

Commit

Permalink
Merge pull request #265 from jenny-s51/add-v6-configs
Browse files Browse the repository at this point in the history 
Update CI and semantic release for the v6 branch
  • Loading branch information
@wise-king-sullyman
wise-king-sullyman authored Nov 6, 2023
2 parents 1072207 + 77e8989 commit 761a8cd
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 39 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/promote.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: promote
on:
push:
# Sequence of patterns matched against refs/tags
tags:
- v5.*
tags:
- v6.*
jobs:
build-and-promote:
runs-on: ubuntu-latest
Expand All @@ -28,4 +28,4 @@ jobs:
run: |
cd packages/module
npm version ${{ github.ref_name }} --git-tag-version false
npm publish --tag=latest
npm publish --tag=latest
1 change: 1 addition & 0 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
push:
branches:
- main
- v6
jobs:
deploy:
runs-on: ubuntu-latest
Expand Down
20 changes: 10 additions & 10 deletions packages/module/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@patternfly/quickstarts",
"version": "0.0.0",
"version": "6.0.0-alpha.0",
"description": "PatternFly quick starts",
"files": [
"src",
Expand All @@ -11,7 +11,7 @@
"types": "dist/index.d.ts",
"publishConfig": {
"access": "public",
"tag": "prerelease"
"tag": "alpha"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -57,14 +57,14 @@
"showdown": "1.8.6"
},
"devDependencies": {
"@patternfly/documentation-framework": "^5.0.15",
"@patternfly/patternfly": "^5.0.0",
"@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-table": "^5.0.0",
"@patternfly/react-code-editor": "^5.0.0",
"@patternfly/documentation-framework": "^5.2.22",
"@patternfly/patternfly": "^6.0.0-alpha.9",
"@patternfly/react-core": "^6.0.0-alpha.1",
"@patternfly/react-icons": "^6.0.0-alpha.1",
"@patternfly/react-styles": "^6.0.0-alpha.1",
"@patternfly/react-tokens": "^6.0.0-alpha.1",
"@patternfly/react-table": "^6.0.0-alpha.1",
"@patternfly/react-code-editor": "^6.0.0-alpha.1",
"react-monaco-editor": "0.51.0",
"monaco-editor": "0.34.1",
"@rollup/plugin-commonjs": "^17.0.0",
Expand Down
5 changes: 3 additions & 2 deletions packages/module/release.config.js
View file
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,4 +23,5 @@ module.exports = {
'@semantic-release/npm',
],
tagFormat: 'prerelease-v${version}',
dryRun: true,
};
92 changes: 68 additions & 24 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1440,21 +1440,21 @@
resolved "https://registry.yarnpkg.com/@oclif/screen/-/screen-1.0.4.tgz#b740f68609dfae8aa71c3a6cab15d816407ba493"
integrity sha512-60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw==

"@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.2.25":
version "1.2.25"
resolved "https://registry.npmjs.org/@patternfly/ast-helpers/-/ast-helpers-1.2.25.tgz#15d38bccfc220f1279c33e05d66e866c5d7f958a"
integrity sha512-G9WEno3JPs89GOSEYb8+z+chxb42pbbMq3kPb+whu2yR7LfwyehFS2h4p+hYjceBVq/3hM1rhmLi6aN+v0z10A==
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.2.22":
version "5.2.25"
resolved "https://registry.npmjs.org/@patternfly/documentation-framework/-/documentation-framework-5.2.25.tgz#d9d4c502f992bca19bed2465e935d2ba30b8dcab"
integrity sha512-CxLrTjNZ2KplakfWEIZP4FruHbFbsLAzLgFW13cD9eqIKdeuCvGSjhgzpr3/9SUMADH5w4gFMsAJZJH2+ptVhg==
dependencies:
"@babel/core" "7.18.2"
"@babel/plugin-proposal-class-properties" "7.17.12"
Expand All @@ -1464,7 +1464,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.2.25"
"@reach/router" "npm:@gatsbyjs/[email protected]"
autoprefixer "9.8.6"
babel-loader "9.1.2"
Expand Down Expand Up @@ -1545,6 +1545,11 @@
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.9":
version "6.0.0-alpha.10"
resolved "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-6.0.0-alpha.10.tgz#000908bbe91e5cbfb9eaa6443f736e04a81fa733"
integrity sha512-iZjLH4J0WYlgq9BUs7kQAJTQv0qfkr7+LRq39GEGOVvw7fmEZ6nhTaagXFgOSPziavNoGjg/iy4Nb6SPaPtPIA==

"@patternfly/quickstarts@^5.0.0-prerelease.2":
version "5.0.0-prerelease.2"
resolved "https://registry.yarnpkg.com/@patternfly/quickstarts/-/quickstarts-5.0.0-prerelease.2.tgz#6568fa97d54d645785597c106eb0511f06fd0a7f"
Expand All @@ -1571,14 +1576,14 @@
"@patternfly/react-core" "^5.0.0-prerelease.26"
"@patternfly/react-styles" "^5.0.0-prerelease.7"

"@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.1":
version "6.0.0-alpha.1"
resolved "https://registry.npmjs.org/@patternfly/react-code-editor/-/react-code-editor-6.0.0-alpha.1.tgz#523aebb729ac10bcd6daca291983e363ea428e36"
integrity sha512-LrAHUL3HExSGQ1/cr5phWOGNQypM05gXQWx2h/+skDe4yNh90+E1Gkuni6A1rhF7MZqugQV54lSszIYRz5gDGQ==
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.1"
"@patternfly/react-icons" "^6.0.0-alpha.1"
"@patternfly/react-styles" "^6.0.0-alpha.1"
react-dropzone "14.2.3"
tslib "^2.5.0"

Expand Down Expand Up @@ -1606,6 +1611,18 @@
react-dropzone "^14.2.3"
tslib "^2.5.0"

"@patternfly/react-core@^6.0.0-alpha.1":
version "6.0.0-alpha.1"
resolved "https://registry.npmjs.org/@patternfly/react-core/-/react-core-6.0.0-alpha.1.tgz#f980c54db22cf42f6592754427a80ce6478a9b5a"
integrity sha512-ht8voYusmtMmAx96DY7NekhszWb8PqMl5Chw+sPBIItRqDbJDQRYXr2JamPhqyVfdmMJ61Jk6d85CumJ/C3wuw==
dependencies:
"@patternfly/react-icons" "^6.0.0-alpha.1"
"@patternfly/react-styles" "^6.0.0-alpha.1"
"@patternfly/react-tokens" "^6.0.0-alpha.1"
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"
Expand All @@ -1616,6 +1633,11 @@
resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-5.0.0-prerelease.9.tgz#0ccdffde7ad7c9712bae158d6c09326831a3ebc0"
integrity sha512-/+g45rml+GpI9UvIlacPLeZvOf5wRzR3DKaFQz4l1UBq+vgfsZbPG4xZb2zYkuVICQvkkdjCP27gSRYwsIX0gw==

"@patternfly/react-icons@^6.0.0-alpha.1":
version "6.0.0-alpha.1"
resolved "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-6.0.0-alpha.1.tgz#2ba63c24e6217a126b8dd9f7f3f8b23dc720c8e9"
integrity sha512-G7ewsy+eQSZGsi5i5Wg3zhwdnFS1S7so5qgaAslbId9yZwiJFnNL6s1c6bOkKwzRhIT6gNRL9YL77iswn7us6g==

"@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"
Expand All @@ -1626,15 +1648,20 @@
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-5.0.0-prerelease.7.tgz#c7d4337c6ae5482b69ad9eb9d93bcc9509644874"
integrity sha512-TKajHVnE7z9DH+pkSNQwz0olktaAjnOtWQP4V4mzx9RmRBIcU1x+hAIQzi2zdDV1MooWry8Gsk6dRC7UI6gJVQ==

"@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==
"@patternfly/react-styles@^6.0.0-alpha.1":
version "6.0.0-alpha.1"
resolved "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-6.0.0-alpha.1.tgz#37b93c184d5d024b38b709afd107adb103568546"
integrity sha512-P5a/LYZkU+GkezhzXQaxRlCzgLCfvJNVAMOYq3m0FD51j4AxwlCkYeqnDxA+YFRMk+DSb8Pp1fXslmwRrFT83Q==

"@patternfly/react-table@^6.0.0-alpha.1":
version "6.0.0-alpha.1"
resolved "https://registry.npmjs.org/@patternfly/react-table/-/react-table-6.0.0-alpha.1.tgz#b8e407054c2ed3d628715ae368f896720f7d9254"
integrity sha512-0ThHk3wrLjDVSv4FZn4GhE+IDhnN92zhSZw/TM4Vsx67V3WrkBys5Iyg518BgohP19Z7D+Dp1V2F5ewJUEsRIQ==
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-core" "^6.0.0-alpha.1"
"@patternfly/react-icons" "^6.0.0-alpha.1"
"@patternfly/react-styles" "^6.0.0-alpha.1"
"@patternfly/react-tokens" "^6.0.0-alpha.1"
lodash "^4.17.19"
tslib "^2.5.0"

Expand All @@ -1648,6 +1675,11 @@
resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-5.0.0-prerelease.9.tgz#c972df627db20f6d5ed20754b16723d6a1b76d3e"
integrity sha512-x3kJolPS95LJSiS2n3T9KL6MNjtuM9qKKzbqK1nkiftAytubcoQ9O7ikEjDYiILHpupo5lG5H9Cr50kAwu1rsA==

"@patternfly/react-tokens@^6.0.0-alpha.1":
version "6.0.0-alpha.1"
resolved "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-6.0.0-alpha.1.tgz#20d67fd871dc3d4cbf26b9414c14d5eb15d5c6e7"
integrity sha512-b3P09skbUvKqgkmOvEwF31izWmkQ8+iUrJzQ6bt0L5D5OvUPMXcy+Ja3dOzaRG8+16S8lvN12h5Sh5RJLL6c1w==

"@percy/agent@~0":
version "0.28.6"
resolved "https://registry.yarnpkg.com/@percy/agent/-/agent-0.28.6.tgz#b220fab6ddcf63ae4e6c343108ba6955a772ce1c"
Expand Down Expand Up @@ -7243,6 +7275,13 @@ [email protected]:
dependencies:
tabbable "^6.1.2"

[email protected]:
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.2.0"

[email protected]:
version "1.12.1"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.12.1.tgz#de54a6205311b93d60398ebc01cf7015682312b6"
Expand Down Expand Up @@ -15063,6 +15102,11 @@ tabbable@^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==

table-layout@^0.4.3, table-layout@~0.4.0:
version "0.4.5"
resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-0.4.5.tgz#d906de6a25fa09c0c90d1d08ecd833ecedcb7378"
Expand Down

0 comments on commit 761a8cd

Please sign in to comment.