Skip to content

Commit 994c416

Browse files
jenny-s51jenny-s51
authored
Update CI and semantic release for v6 branch (#50)
* update CI and semantic release for v6 branch * revert docs framework bump to fix ci * update main branch channel and prerelease values to alpha * Update tests and yarn.lock BREAKING CHANGE * Update tests BREAKING CHANGE * fix tests
1 parent c93aabd commit 994c416

File tree

8 files changed

+96
-71
lines changed

8 files changed

+96
-71
lines changed

‎.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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@patternfly/react-console",
3-
"version": "0.0.0",
3+
"version": "6.0.0-alpha.0",
44
"description": "This package provides VncConsole, SerialConsole and DesktopViewer React components to be used alongside patternfly-react to access virtual machine or server consoles.",
55
"main": "dist/esm/index.js",
66
"module": "dist/esm/index.js",
@@ -30,12 +30,12 @@
3030
"homepage": "https://github.com/patternfly/react-console/#readme",
3131
"publishConfig": {
3232
"access": "public",
33-
"tag": "prerelease"
33+
"tag": "alpha"
3434
},
3535
"dependencies": {
3636
"@novnc/novnc": "^1.3.0",
37-
"@patternfly/react-core": "^5.0.0",
38-
"@patternfly/react-styles": "^5.0.0",
37+
"@patternfly/react-core": "^6.0.0-alpha.1",
38+
"@patternfly/react-styles": "^6.0.0-alpha.1",
3939
"@spice-project/spice-html5": "^0.2.1",
4040
"file-saver": "^1.3.8",
4141
"xterm": "^4.8.1",
@@ -47,10 +47,10 @@
4747
},
4848
"devDependencies": {
4949
"@patternfly/documentation-framework": "^5.0.15",
50-
"@patternfly/patternfly": "^5.0.0",
50+
"@patternfly/patternfly": "^6.0.0-alpha.9",
5151
"@patternfly/patternfly-a11y": "^4.3.1",
52-
"@patternfly/react-code-editor": "^5.0.0",
53-
"@patternfly/react-table": "^5.0.0",
52+
"@patternfly/react-code-editor": "^6.0.0-alpha.1",
53+
"@patternfly/react-table": "^6.0.0-alpha.1",
5454
"rimraf": "^2.6.2",
5555
"serve": "^14.1.2",
5656
"react-monaco-editor": "^0.51.0",

‎packages/module/release.config.js‎

Lines changed: 4 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'
@@ -22,5 +22,6 @@ module.exports = {
2222
'@semantic-release/github',
2323
'@semantic-release/npm'
2424
],
25-
tagFormat: 'prerelease-v${version}'
25+
tagFormat: 'prerelease-v${version}',
26+
dryRun: true
2627
};

‎packages/module/src/components/DesktopViewer/ConnectWithRemoteViewer.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ export const ConnectWithRemoteViewer: React.FunctionComponent<ConnectWithRemoteV
111111
{!!_console && (
112112
<ExpandableSection
113113
toggleText={textMoreInfo}
114+
toggleId="remote-viewer-details-toggle"
115+
contentId="remote-viewer-details-content"
114116
isExpanded={isExpandedDefault}
115117
onToggle={(_event, isExpanded) => setIsExpandedDefault(isExpanded)}
116118
>
@@ -121,6 +123,8 @@ export const ConnectWithRemoteViewer: React.FunctionComponent<ConnectWithRemoteV
121123
<ExpandableSection
122124
toggleText={textMoreRDPInfo}
123125
isExpanded={isExpandedRDP}
126+
toggleId="remote-desktop-details-toggle"
127+
contentId="remote-desktop-details-content"
124128
onToggle={(_event, isExpanded) => setIsExpandedRDP(isExpanded)}
125129
>
126130
<MoreInformationDefaultRDPContent textMoreRDPInfoContent={textMoreRDPInfoContent} />

‎packages/module/src/components/DesktopViewer/__snapshots__/DesktopViewer.test.tsx.snap‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,10 @@ exports[`DesktopViewer with Spice and VNC 1`] = `
212212
class="pf-v5-c-expandable-section"
213213
>
214214
<button
215+
aria-controls="remote-viewer-details-content"
215216
aria-expanded="false"
216217
class="pf-v5-c-expandable-section__toggle"
218+
id="remote-viewer-details-toggle"
217219
type="button"
218220
>
219221
<span
@@ -240,9 +242,11 @@ exports[`DesktopViewer with Spice and VNC 1`] = `
240242
</span>
241243
</button>
242244
<div
245+
aria-labelledby="remote-viewer-details-toggle"
243246
class="pf-v5-c-expandable-section__content"
244247
hidden=""
245-
id=""
248+
id="remote-viewer-details-content"
249+
role="region"
246250
>
247251
<dl
248252
class="pf-v5-c-description-list pf-m-horizontal"
@@ -539,8 +543,10 @@ exports[`DesktopViewer with Spice, VNC and RDP (different hostname) 1`] = `
539543
class="pf-v5-c-expandable-section"
540544
>
541545
<button
546+
aria-controls="remote-viewer-details-content"
542547
aria-expanded="false"
543548
class="pf-v5-c-expandable-section__toggle"
549+
id="remote-viewer-details-toggle"
544550
type="button"
545551
>
546552
<span
@@ -567,9 +573,11 @@ exports[`DesktopViewer with Spice, VNC and RDP (different hostname) 1`] = `
567573
</span>
568574
</button>
569575
<div
576+
aria-labelledby="remote-viewer-details-toggle"
570577
class="pf-v5-c-expandable-section__content"
571578
hidden=""
572-
id=""
579+
id="remote-viewer-details-content"
580+
role="region"
573581
>
574582
<dl
575583
class="pf-v5-c-description-list pf-m-horizontal"
@@ -700,8 +708,10 @@ exports[`DesktopViewer with Spice, VNC and RDP (different hostname) 1`] = `
700708
class="pf-v5-c-expandable-section"
701709
>
702710
<button
711+
aria-controls="remote-desktop-details-content"
703712
aria-expanded="false"
704713
class="pf-v5-c-expandable-section__toggle"
714+
id="remote-desktop-details-toggle"
705715
type="button"
706716
>
707717
<span
@@ -728,9 +738,11 @@ exports[`DesktopViewer with Spice, VNC and RDP (different hostname) 1`] = `
728738
</span>
729739
</button>
730740
<div
741+
aria-labelledby="remote-desktop-details-toggle"
731742
class="pf-v5-c-expandable-section__content"
732743
hidden=""
733-
id=""
744+
id="remote-desktop-details-content"
745+
role="region"
734746
/>
735747
</div>
736748
</div>
@@ -947,8 +959,10 @@ exports[`DesktopViewer with Spice, VNC and RDP 1`] = `
947959
class="pf-v5-c-expandable-section"
948960
>
949961
<button
962+
aria-controls="remote-viewer-details-content"
950963
aria-expanded="false"
951964
class="pf-v5-c-expandable-section__toggle"
965+
id="remote-viewer-details-toggle"
952966
type="button"
953967
>
954968
<span
@@ -975,9 +989,11 @@ exports[`DesktopViewer with Spice, VNC and RDP 1`] = `
975989
</span>
976990
</button>
977991
<div
992+
aria-labelledby="remote-viewer-details-toggle"
978993
class="pf-v5-c-expandable-section__content"
979994
hidden=""
980-
id=""
995+
id="remote-viewer-details-content"
996+
role="region"
981997
>
982998
<dl
983999
class="pf-v5-c-description-list pf-m-horizontal"
@@ -1108,8 +1124,10 @@ exports[`DesktopViewer with Spice, VNC and RDP 1`] = `
11081124
class="pf-v5-c-expandable-section"
11091125
>
11101126
<button
1127+
aria-controls="remote-desktop-details-content"
11111128
aria-expanded="false"
11121129
class="pf-v5-c-expandable-section__toggle"
1130+
id="remote-desktop-details-toggle"
11131131
type="button"
11141132
>
11151133
<span
@@ -1136,9 +1154,11 @@ exports[`DesktopViewer with Spice, VNC and RDP 1`] = `
11361154
</span>
11371155
</button>
11381156
<div
1157+
aria-labelledby="remote-desktop-details-toggle"
11391158
class="pf-v5-c-expandable-section__content"
11401159
hidden=""
1141-
id=""
1160+
id="remote-desktop-details-content"
1161+
role="region"
11421162
/>
11431163
</div>
11441164
</div>

‎yarn.lock‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1675,60 +1675,60 @@
16751675
puppeteer-cluster "^0.23.0"
16761676
xmldoc "^1.1.2"
16771677

1678-
"@patternfly/patternfly@^5.0.0":
1679-
version "5.0.2"
1680-
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.0.2.tgz#f5daf2c98ccb85e6466d42fd61d39ba3c10ed532"
1681-
integrity sha512-PB8+MLdYVgF1hIOxGmnVsZG+YHUX3RePe5W1oMS4gS00EmSgw1cobr1Qbpy/BqqS8/R9DRN4hZ2FKDT0d5tkFQ==
1682-
1683-
"@patternfly/react-code-editor@^5.0.0":
1684-
version "5.0.0"
1685-
resolved "https://registry.yarnpkg.com/@patternfly/react-code-editor/-/react-code-editor-5.0.0.tgz#2ba9d49a84023907b94fcbec13ec62b2d463d33e"
1686-
integrity sha512-Ya1nuw2Zcor/MET+s0+VuYq2VsRb+VzKpZQ8Y1MbrXJdlWV6QS5Wf1M7jDl9lYkiJaS3pjG7eXNeVX2YJ+mQiw==
1687-
dependencies:
1688-
"@patternfly/react-core" "^5.0.0"
1689-
"@patternfly/react-icons" "^5.0.0"
1690-
"@patternfly/react-styles" "^5.0.0"
1678+
"@patternfly/patternfly@^6.0.0-alpha.9":
1679+
version "6.0.0-alpha.10"
1680+
resolved "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-6.0.0-alpha.10.tgz#000908bbe91e5cbfb9eaa6443f736e04a81fa733"
1681+
integrity sha512-iZjLH4J0WYlgq9BUs7kQAJTQv0qfkr7+LRq39GEGOVvw7fmEZ6nhTaagXFgOSPziavNoGjg/iy4Nb6SPaPtPIA==
1682+
1683+
"@patternfly/react-code-editor@^6.0.0-alpha.1":
1684+
version "6.0.0-alpha.1"
1685+
resolved "https://registry.npmjs.org/@patternfly/react-code-editor/-/react-code-editor-6.0.0-alpha.1.tgz#523aebb729ac10bcd6daca291983e363ea428e36"
1686+
integrity sha512-LrAHUL3HExSGQ1/cr5phWOGNQypM05gXQWx2h/+skDe4yNh90+E1Gkuni6A1rhF7MZqugQV54lSszIYRz5gDGQ==
1687+
dependencies:
1688+
"@patternfly/react-core" "^6.0.0-alpha.1"
1689+
"@patternfly/react-icons" "^6.0.0-alpha.1"
1690+
"@patternfly/react-styles" "^6.0.0-alpha.1"
16911691
react-dropzone "14.2.3"
16921692
tslib "^2.5.0"
16931693

1694-
"@patternfly/react-core@^5.0.0":
1695-
version "5.0.0"
1696-
resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-5.0.0.tgz#96c9e2315047eec94d28f5621c02fa147182dd6f"
1697-
integrity sha512-kewRVFhLw0Dvt8250pqrO47sVRx8E93sMGZbHQomJnZdachYeQ9STnQTP2gvOBq/GPnMei0LZLv0T99g8mPE4w==
1694+
"@patternfly/react-core@^6.0.0-alpha.1":
1695+
version "6.0.0-alpha.1"
1696+
resolved "https://registry.npmjs.org/@patternfly/react-core/-/react-core-6.0.0-alpha.1.tgz#f980c54db22cf42f6592754427a80ce6478a9b5a"
1697+
integrity sha512-ht8voYusmtMmAx96DY7NekhszWb8PqMl5Chw+sPBIItRqDbJDQRYXr2JamPhqyVfdmMJ61Jk6d85CumJ/C3wuw==
16981698
dependencies:
1699-
"@patternfly/react-icons" "^5.0.0"
1700-
"@patternfly/react-styles" "^5.0.0"
1701-
"@patternfly/react-tokens" "^5.0.0"
1702-
focus-trap "7.4.3"
1699+
"@patternfly/react-icons" "^6.0.0-alpha.1"
1700+
"@patternfly/react-styles" "^6.0.0-alpha.1"
1701+
"@patternfly/react-tokens" "^6.0.0-alpha.1"
1702+
focus-trap "7.5.2"
17031703
react-dropzone "^14.2.3"
17041704
tslib "^2.5.0"
17051705

1706-
"@patternfly/react-icons@^5.0.0":
1707-
version "5.0.0"
1708-
resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-5.0.0.tgz#bb56ead97425f1b3ab886ee291ba6b6af4088e9d"
1709-
integrity sha512-GG5Y/UYl0h346MyDU9U650Csaq4Mxk8S6U8XC7ERk/xIrRr2RF67O2uY7zKBDMTNLYdBvPzgc2s3OMV1+d2/mg==
1710-
1711-
"@patternfly/react-styles@^5.0.0":
1712-
version "5.0.0"
1713-
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-5.0.0.tgz#63705ad498ff271fd056e92bd07b2c720ef3491a"
1714-
integrity sha512-xbSCgjx+fPrXbIzUznwTFWtJEbzVS0Wn4zrejdKJYQTY+4YcuPlFkeq2tl3syzwGsaYMpHiFwQiTaKyTvlwtuw==
1715-
1716-
"@patternfly/react-table@^5.0.0":
1717-
version "5.0.0"
1718-
resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-5.0.0.tgz#2808f22d01818c31e6ddc69cc3a07c9381dc6d84"
1719-
integrity sha512-Q3MBo9+ZmBvLJzVHxmV9f/4qQAz5Si743zVLHRwjh+tjbn/DrcbxJdT8Uxa3NGKkpvszzgi/LPeXipJOHOELug==
1720-
dependencies:
1721-
"@patternfly/react-core" "^5.0.0"
1722-
"@patternfly/react-icons" "^5.0.0"
1723-
"@patternfly/react-styles" "^5.0.0"
1724-
"@patternfly/react-tokens" "^5.0.0"
1706+
"@patternfly/react-icons@^6.0.0-alpha.1":
1707+
version "6.0.0-alpha.1"
1708+
resolved "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-6.0.0-alpha.1.tgz#2ba63c24e6217a126b8dd9f7f3f8b23dc720c8e9"
1709+
integrity sha512-G7ewsy+eQSZGsi5i5Wg3zhwdnFS1S7so5qgaAslbId9yZwiJFnNL6s1c6bOkKwzRhIT6gNRL9YL77iswn7us6g==
1710+
1711+
"@patternfly/react-styles@^6.0.0-alpha.1":
1712+
version "6.0.0-alpha.1"
1713+
resolved "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-6.0.0-alpha.1.tgz#37b93c184d5d024b38b709afd107adb103568546"
1714+
integrity sha512-P5a/LYZkU+GkezhzXQaxRlCzgLCfvJNVAMOYq3m0FD51j4AxwlCkYeqnDxA+YFRMk+DSb8Pp1fXslmwRrFT83Q==
1715+
1716+
"@patternfly/react-table@^6.0.0-alpha.1":
1717+
version "6.0.0-alpha.1"
1718+
resolved "https://registry.npmjs.org/@patternfly/react-table/-/react-table-6.0.0-alpha.1.tgz#b8e407054c2ed3d628715ae368f896720f7d9254"
1719+
integrity sha512-0ThHk3wrLjDVSv4FZn4GhE+IDhnN92zhSZw/TM4Vsx67V3WrkBys5Iyg518BgohP19Z7D+Dp1V2F5ewJUEsRIQ==
1720+
dependencies:
1721+
"@patternfly/react-core" "^6.0.0-alpha.1"
1722+
"@patternfly/react-icons" "^6.0.0-alpha.1"
1723+
"@patternfly/react-styles" "^6.0.0-alpha.1"
1724+
"@patternfly/react-tokens" "^6.0.0-alpha.1"
17251725
lodash "^4.17.19"
17261726
tslib "^2.5.0"
17271727

1728-
"@patternfly/react-tokens@^5.0.0":
1729-
version "5.0.0"
1730-
resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-5.0.0.tgz#8e2698d32d5353359e713312687a6b08ead0080b"
1731-
integrity sha512-to2CXIZ6WTuzBcjLZ+nXi5LhnYkSIDu3RBMRZwrplmECOoUWv87CC+2T0EVxtASRtpQfikjD2PDKMsif5i0BxQ==
1728+
"@patternfly/react-tokens@^6.0.0-alpha.1":
1729+
version "6.0.0-alpha.1"
1730+
resolved "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-6.0.0-alpha.1.tgz#20d67fd871dc3d4cbf26b9414c14d5eb15d5c6e7"
1731+
integrity sha512-b3P09skbUvKqgkmOvEwF31izWmkQ8+iUrJzQ6bt0L5D5OvUPMXcy+Ja3dOzaRG8+16S8lvN12h5Sh5RJLL6c1w==
17321732

17331733
"@polka/url@^1.0.0-next.20":
17341734
version "1.0.0-next.21"
@@ -5098,12 +5098,12 @@ flush-write-stream@^1.0.0:
50985098
inherits "^2.0.3"
50995099
readable-stream "^2.3.6"
51005100

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

51085108
[email protected]:
51095109
version "1.5.10"
@@ -9678,10 +9678,10 @@ symbol-tree@^3.2.4:
96789678
resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz"
96799679
integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
96809680

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

96869686
tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
96879687
version "2.2.1"

0 commit comments

Comments
 (0)