From a9150a58ad9090856b9158ee7cc851b37df10e9d Mon Sep 17 00:00:00 2001 From: Jenny <32821331+jenny-s51@users.noreply.github.com> Date: Tue, 24 Oct 2023 14:17:57 -0400 Subject: [PATCH 1/6] update CI and semantic release for v6 branch --- .github/workflows/check-pr.yml | 2 +- .github/workflows/promote.yml | 2 +- .github/workflows/release.yml | 2 +- packages/module/package.json | 16 ++++++++-------- packages/module/release.config.js | 7 ++++--- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml index e193a8c..2941006 100644 --- a/.github/workflows/check-pr.yml +++ b/.github/workflows/check-pr.yml @@ -3,7 +3,7 @@ on: pull_request: branches: - main - - v4 + - v6 jobs: call-build-lint-test-workflow: uses: ./.github/workflows/build-lint-test.yml diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml index 60134a4..6301bd1 100644 --- a/.github/workflows/promote.yml +++ b/.github/workflows/promote.yml @@ -3,7 +3,7 @@ on: push: # Sequence of patterns matched against refs/tags tags: - - v5.* + - v6.* jobs: build-and-promote: runs-on: ubuntu-latest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 142b211..2e62110 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ on: push: branches: - main - - v4 + - v6 jobs: call-build-lint-test-workflow: uses: ./.github/workflows/build-lint-test.yml diff --git a/packages/module/package.json b/packages/module/package.json index 168a6f5..ad32a12 100644 --- a/packages/module/package.json +++ b/packages/module/package.json @@ -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", @@ -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", @@ -46,11 +46,11 @@ "react-dom": "^17 || ^18" }, "devDependencies": { - "@patternfly/documentation-framework": "^5.0.15", - "@patternfly/patternfly": "^5.0.0", + "@patternfly/documentation-framework": "^5.2.22", + "@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", diff --git a/packages/module/release.config.js b/packages/module/release.config.js index b72ce6f..96eb677 100644 --- a/packages/module/release.config.js +++ b/packages/module/release.config.js @@ -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: 'prerelease', prerelease: 'prerelease' }, + { name: 'v6', channel: 'prerelease-v6', range: '6.x' } ], analyzeCommits: { preset: 'angular' @@ -22,5 +22,6 @@ module.exports = { '@semantic-release/github', '@semantic-release/npm' ], - tagFormat: 'prerelease-v${version}' + tagFormat: 'prerelease-v${version}', + dryRun: true }; From 54a26dd36d9420d666885df718f01de1c562aa74 Mon Sep 17 00:00:00 2001 From: Jenny <32821331+jenny-s51@users.noreply.github.com> Date: Wed, 25 Oct 2023 16:24:00 -0400 Subject: [PATCH 2/6] revert docs framework bump to fix ci --- packages/module/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/module/package.json b/packages/module/package.json index ad32a12..2eb6ce1 100644 --- a/packages/module/package.json +++ b/packages/module/package.json @@ -46,7 +46,7 @@ "react-dom": "^17 || ^18" }, "devDependencies": { - "@patternfly/documentation-framework": "^5.2.22", + "@patternfly/documentation-framework": "^5.0.15", "@patternfly/patternfly": "^6.0.0-alpha.9", "@patternfly/patternfly-a11y": "^4.3.1", "@patternfly/react-code-editor": "^6.0.0-alpha.1", From 9897aab9f11022e7c8783649e5a2f8331ffaba76 Mon Sep 17 00:00:00 2001 From: Jenny <32821331+jenny-s51@users.noreply.github.com> Date: Mon, 30 Oct 2023 09:34:36 -0400 Subject: [PATCH 3/6] update main branch channel and prerelease values to alpha --- packages/module/release.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/module/release.config.js b/packages/module/release.config.js index 96eb677..0eb3312 100644 --- a/packages/module/release.config.js +++ b/packages/module/release.config.js @@ -1,7 +1,7 @@ module.exports = { branches: [ 'do-not-delete', - { name: 'main', channel: 'prerelease', prerelease: 'prerelease' }, + { name: 'main', channel: 'alpha', prerelease: 'alpha' }, { name: 'v6', channel: 'prerelease-v6', range: '6.x' } ], analyzeCommits: { From 22c999b3ba61ef071350479fb2bddd46d6ff120b Mon Sep 17 00:00:00 2001 From: Jenny <32821331+jenny-s51@users.noreply.github.com> Date: Mon, 30 Oct 2023 10:21:49 -0400 Subject: [PATCH 4/6] Update tests and yarn.lock BREAKING CHANGE --- .../__snapshots__/DesktopViewer.test.tsx.snap | 30 ++++- yarn.lock | 106 +++++++++--------- 2 files changed, 78 insertions(+), 58 deletions(-) diff --git a/packages/module/src/components/DesktopViewer/__snapshots__/DesktopViewer.test.tsx.snap b/packages/module/src/components/DesktopViewer/__snapshots__/DesktopViewer.test.tsx.snap index 7f03eff..e1ba989 100644 --- a/packages/module/src/components/DesktopViewer/__snapshots__/DesktopViewer.test.tsx.snap +++ b/packages/module/src/components/DesktopViewer/__snapshots__/DesktopViewer.test.tsx.snap @@ -212,8 +212,10 @@ exports[`DesktopViewer with Spice and VNC 1`] = ` class="pf-v5-c-expandable-section" >