Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update CI and semantic release for v6 branch #50

Merged
merged 6 commits into from
Nov 8, 2023
Merged

Update CI and semantic release for v6 branch #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a9150a5
update CI and semantic release for v6 branch
jenny-s51 Oct 24, 2023
54a26dd
revert docs framework bump to fix ci
jenny-s51 Oct 25, 2023
9897aab
update main branch channel and prerelease values to alpha
jenny-s51 Oct 30, 2023
22c999b
Update tests and yarn.lock
jenny-s51 Oct 30, 2023
4321e42
Update tests
jenny-s51 Oct 30, 2023
7ff3e8c
fix tests
jenny-s51 Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check-pr.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
14 changes: 7 additions & 7 deletions packages/module/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@patternfly/react-console",
"version": "0.0.0",
"version": "6.0.0-alpha.0",
"description": "This package provides VncConsole, SerialConsole and DesktopViewer React components to be used alongside patternfly-react to access virtual machine or server consoles.",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
Expand Down Expand Up @@ -30,12 +30,12 @@
"homepage": "https://github.com/patternfly/react-console/#readme",
"publishConfig": {
"access": "public",
"tag": "prerelease"
"tag": "alpha"
},
"dependencies": {
"@novnc/novnc": "^1.3.0",
"@patternfly/react-core": "^5.0.0",
"@patternfly/react-styles": "^5.0.0",
"@patternfly/react-core": "^6.0.0-alpha.1",
"@patternfly/react-styles": "^6.0.0-alpha.1",
"@spice-project/spice-html5": "^0.2.1",
"file-saver": "^1.3.8",
"xterm": "^4.8.1",
Expand All @@ -47,10 +47,10 @@
},
"devDependencies": {
"@patternfly/documentation-framework": "^5.0.15",
"@patternfly/patternfly": "^5.0.0",
"@patternfly/patternfly": "^6.0.0-alpha.9",
"@patternfly/patternfly-a11y": "^4.3.1",
"@patternfly/react-code-editor": "^5.0.0",
"@patternfly/react-table": "^5.0.0",
"@patternfly/react-code-editor": "^6.0.0-alpha.1",
"@patternfly/react-table": "^6.0.0-alpha.1",
"rimraf": "^2.6.2",
"serve": "^14.1.2",
"react-monaco-editor": "^0.51.0",
Expand Down
7 changes: 4 additions & 3 deletions packages/module/release.config.js
View file
Open in desktop
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 @@ -22,5 +22,6 @@ module.exports = {
'@semantic-release/github',
'@semantic-release/npm'
],
tagFormat: 'prerelease-v${version}'
tagFormat: 'prerelease-v${version}',
dryRun: true
};
4 changes: 4 additions & 0 deletions packages/module/src/components/DesktopViewer/ConnectWithRemoteViewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ export const ConnectWithRemoteViewer: React.FunctionComponent<ConnectWithRemoteV
{!!_console && (
<ExpandableSection
toggleText={textMoreInfo}
toggleId="remote-viewer-details-toggle"
contentId="remote-viewer-details-content"
isExpanded={isExpandedDefault}
onToggle={(_event, isExpanded) => setIsExpandedDefault(isExpanded)}
>
Expand All @@ -121,6 +123,8 @@ export const ConnectWithRemoteViewer: React.FunctionComponent<ConnectWithRemoteV
<ExpandableSection
toggleText={textMoreRDPInfo}
isExpanded={isExpandedRDP}
toggleId="remote-desktop-details-toggle"
contentId="remote-desktop-details-content"
onToggle={(_event, isExpanded) => setIsExpandedRDP(isExpanded)}
>
<MoreInformationDefaultRDPContent textMoreRDPInfoContent={textMoreRDPInfoContent} />
Expand Down
30 changes: 25 additions & 5 deletions packages/module/src/components/DesktopViewer/__snapshots__/DesktopViewer.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,10 @@ exports[`DesktopViewer with Spice and VNC 1`] = `
class="pf-v5-c-expandable-section"
>
<button
aria-controls="remote-viewer-details-content"
aria-expanded="false"
class="pf-v5-c-expandable-section__toggle"
id="remote-viewer-details-toggle"
type="button"
>
<span
Expand All @@ -240,9 +242,11 @@ exports[`DesktopViewer with Spice and VNC 1`] = `
</span>
</button>
<div
aria-labelledby="remote-viewer-details-toggle"
class="pf-v5-c-expandable-section__content"
hidden=""
id=""
id="remote-viewer-details-content"
role="region"
>
<dl
class="pf-v5-c-description-list pf-m-horizontal"
Expand Down Expand Up @@ -539,8 +543,10 @@ exports[`DesktopViewer with Spice, VNC and RDP (different hostname) 1`] = `
class="pf-v5-c-expandable-section"
>
<button
aria-controls="remote-viewer-details-content"
aria-expanded="false"
class="pf-v5-c-expandable-section__toggle"
id="remote-viewer-details-toggle"
type="button"
>
<span
Expand All @@ -567,9 +573,11 @@ exports[`DesktopViewer with Spice, VNC and RDP (different hostname) 1`] = `
</span>
</button>
<div
aria-labelledby="remote-viewer-details-toggle"
class="pf-v5-c-expandable-section__content"
hidden=""
id=""
id="remote-viewer-details-content"
role="region"
>
<dl
class="pf-v5-c-description-list pf-m-horizontal"
Expand Down Expand Up @@ -700,8 +708,10 @@ exports[`DesktopViewer with Spice, VNC and RDP (different hostname) 1`] = `
class="pf-v5-c-expandable-section"
>
<button
aria-controls="remote-desktop-details-content"
aria-expanded="false"
class="pf-v5-c-expandable-section__toggle"
id="remote-desktop-details-toggle"
type="button"
>
<span
Expand All @@ -728,9 +738,11 @@ exports[`DesktopViewer with Spice, VNC and RDP (different hostname) 1`] = `
</span>
</button>
<div
aria-labelledby="remote-desktop-details-toggle"
class="pf-v5-c-expandable-section__content"
hidden=""
id=""
id="remote-desktop-details-content"
role="region"
/>
</div>
</div>
Expand Down Expand Up @@ -947,8 +959,10 @@ exports[`DesktopViewer with Spice, VNC and RDP 1`] = `
class="pf-v5-c-expandable-section"
>
<button
aria-controls="remote-viewer-details-content"
aria-expanded="false"
class="pf-v5-c-expandable-section__toggle"
id="remote-viewer-details-toggle"
type="button"
>
<span
Expand All @@ -975,9 +989,11 @@ exports[`DesktopViewer with Spice, VNC and RDP 1`] = `
</span>
</button>
<div
aria-labelledby="remote-viewer-details-toggle"
class="pf-v5-c-expandable-section__content"
hidden=""
id=""
id="remote-viewer-details-content"
role="region"
>
<dl
class="pf-v5-c-description-list pf-m-horizontal"
Expand Down Expand Up @@ -1108,8 +1124,10 @@ exports[`DesktopViewer with Spice, VNC and RDP 1`] = `
class="pf-v5-c-expandable-section"
>
<button
aria-controls="remote-desktop-details-content"
aria-expanded="false"
class="pf-v5-c-expandable-section__toggle"
id="remote-desktop-details-toggle"
type="button"
>
<span
Expand All @@ -1136,9 +1154,11 @@ exports[`DesktopViewer with Spice, VNC and RDP 1`] = `
</span>
</button>
<div
aria-labelledby="remote-desktop-details-toggle"
class="pf-v5-c-expandable-section__content"
hidden=""
id=""
id="remote-desktop-details-content"
role="region"
/>
</div>
</div>
Expand Down
106 changes: 53 additions & 53 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1675,60 +1675,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/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==
dependencies:
"@patternfly/react-core" "^5.0.0"
"@patternfly/react-icons" "^5.0.0"
"@patternfly/react-styles" "^5.0.0"
"@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/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" "^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"

"@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.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" "^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.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"
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.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@^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" "^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"

"@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.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==

"@polka/url@^1.0.0-next.20":
version "1.0.0-next.21"
Expand Down Expand Up @@ -5098,12 +5098,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"

[email protected]:
version "1.5.10"
Expand Down Expand Up @@ -9678,10 +9678,10 @@ symbol-tree@^3.2.4:
resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz"
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
Loading