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..2eb6ce1 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", @@ -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", diff --git a/packages/module/release.config.js b/packages/module/release.config.js index b72ce6f..0eb3312 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: 'alpha', prerelease: 'alpha' }, + { 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 }; diff --git a/packages/module/src/components/DesktopViewer/ConnectWithRemoteViewer.tsx b/packages/module/src/components/DesktopViewer/ConnectWithRemoteViewer.tsx index a1d072b..dafde42 100644 --- a/packages/module/src/components/DesktopViewer/ConnectWithRemoteViewer.tsx +++ b/packages/module/src/components/DesktopViewer/ConnectWithRemoteViewer.tsx @@ -111,6 +111,8 @@ export const ConnectWithRemoteViewer: React.FunctionComponent setIsExpandedDefault(isExpanded)} > @@ -121,6 +123,8 @@ export const ConnectWithRemoteViewer: React.FunctionComponent setIsExpandedRDP(isExpanded)} > 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..9aa1d21 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" >