From d3a36169412774cd73a9b1041ddb62f36bb21650 Mon Sep 17 00:00:00 2001 From: nicolethoen Date: Mon, 5 Jun 2023 16:04:24 -0400 Subject: [PATCH 1/2] fix(release): dryrun publishing prereleases --- .github/release.sh | 4 ++-- .../package.json | 2 +- packages/react-charts/package.json | 6 +++--- packages/react-code-editor/package.json | 8 ++++---- packages/react-core/package.json | 10 +++++----- packages/react-docs/package.json | 18 +++++++++--------- packages/react-icons/package.json | 4 ++-- .../react-integration/demo-app-ts/package.json | 4 ++-- packages/react-integration/package.json | 2 +- packages/react-styles/package.json | 4 ++-- packages/react-table/package.json | 10 +++++----- packages/react-tokens/package.json | 4 ++-- yarn.lock | 8 ++++---- 13 files changed, 42 insertions(+), 42 deletions(-) diff --git a/.github/release.sh b/.github/release.sh index c4a8b3d0096..d20a9ee0afc 100755 --- a/.github/release.sh +++ b/.github/release.sh @@ -17,8 +17,8 @@ echo "Doing a release..." LOG=$(git log --format="%s" -1 | grep -Poe "#\d+") PR_NUM=${LOG:1} -# yarn run lerna publish --conventional-commits --conventional-prerelease --create-release=github --no-verify-access --dist-tag=alpha --yes 2>&1 | tee lerna-output.txt -yarn run lerna version --conventional-commits --conventional-prerelease --no-private --yes --no-git-tag-version --no-push +# yarn run lerna publish --conventional-commits --conventional-prerelease --create-release=github --no-verify-access --dist-tag=prerelease --yes 2>&1 | tee lerna-output.txt +yarn run lerna version --conventional-commits --conventional-prerelease --dist-tag=prerelease --no-private --yes --no-git-tag-version --no-push if grep -i "Successfully published" lerna-output.txt; # Leave a Github comment then diff --git a/packages/eslint-plugin-patternfly-react/package.json b/packages/eslint-plugin-patternfly-react/package.json index 2f14d40e9be..58821015fb9 100644 --- a/packages/eslint-plugin-patternfly-react/package.json +++ b/packages/eslint-plugin-patternfly-react/package.json @@ -1,6 +1,6 @@ { "name": "eslint-plugin-patternfly-react", - "version": "4.80.5-alpha.1", + "version": "5.0.0-prerelease.0", "private": false, "main": "./lib/index.js", "license": "MIT", diff --git a/packages/react-charts/package.json b/packages/react-charts/package.json index 4ad2a322aca..5138d2a268b 100644 --- a/packages/react-charts/package.json +++ b/packages/react-charts/package.json @@ -1,6 +1,6 @@ { "name": "@patternfly/react-charts", - "version": "7.0.0-alpha.35", + "version": "7.0.0-prerelease.0", "description": "This library provides a set of React chart components for use with the PatternFly reference implementation.", "main": "dist/js/index.js", "module": "dist/esm/index.js", @@ -29,8 +29,8 @@ }, "homepage": "https://github.com/patternfly/patternfly-react#readme", "dependencies": { - "@patternfly/react-styles": "^5.0.0-alpha.19", - "@patternfly/react-tokens": "^5.0.0-alpha.16", + "@patternfly/react-styles": "^5.0.0-prerelease.0", + "@patternfly/react-tokens": "^5.0.0-prerelease.0", "hoist-non-react-statics": "^3.3.0", "lodash": "^4.17.19", "tslib": "^2.5.0", diff --git a/packages/react-code-editor/package.json b/packages/react-code-editor/package.json index d65af81f787..1366c6d9dce 100644 --- a/packages/react-code-editor/package.json +++ b/packages/react-code-editor/package.json @@ -1,6 +1,6 @@ { "name": "@patternfly/react-code-editor", - "version": "5.0.0-alpha.133", + "version": "5.0.0-prerelease.0", "description": "This package provides a PatternFly wrapper for the Monaco code editor\n", "main": "dist/js/index.js", "module": "dist/esm/index.js", @@ -30,9 +30,9 @@ "clean": "rimraf dist" }, "dependencies": { - "@patternfly/react-core": "^5.0.0-alpha.132", - "@patternfly/react-icons": "^5.0.0-alpha.21", - "@patternfly/react-styles": "^5.0.0-alpha.19", + "@patternfly/react-core": "^5.0.0-prerelease.0", + "@patternfly/react-icons": "^5.0.0-prerelease.0", + "@patternfly/react-styles": "^5.0.0-prerelease.0", "react-dropzone": "14.2.3", "tslib": "^2.5.0" }, diff --git a/packages/react-core/package.json b/packages/react-core/package.json index d8e2604e79f..b78ce2ca828 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -1,6 +1,6 @@ { "name": "@patternfly/react-core", - "version": "5.0.0-alpha.132", + "version": "5.0.0-prerelease.0", "description": "This library provides a set of common React components for use with the PatternFly reference implementation.", "main": "dist/js/index.js", "module": "dist/esm/index.js", @@ -46,15 +46,15 @@ "subpaths": "node scripts/createSubpaths.js" }, "dependencies": { - "@patternfly/react-icons": "^5.0.0-alpha.21", - "@patternfly/react-styles": "^5.0.0-alpha.19", - "@patternfly/react-tokens": "^5.0.0-alpha.16", + "@patternfly/react-icons": "^5.0.0-prerelease.0", + "@patternfly/react-styles": "^5.0.0-prerelease.0", + "@patternfly/react-tokens": "^5.0.0-prerelease.0", "focus-trap": "7.4.3", "react-dropzone": "^14.2.3", "tslib": "^2.5.0" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.74", + "@patternfly/patternfly": "5.0.0-prerelease.1", "@rollup/plugin-commonjs": "^25.0.0", "@rollup/plugin-node-resolve": "^15.0.2", "@rollup/plugin-replace": "^5.0.2", diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 91a09a1e6eb..b51b8d1bc66 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -1,7 +1,7 @@ { "name": "@patternfly/react-docs", "description": "PatternFly React Docs", - "version": "6.0.0-alpha.142", + "version": "6.0.0-prerelease.0", "publishConfig": { "access": "public", "tag": "prerelease-v4" @@ -23,14 +23,14 @@ "test:a11y": "patternfly-a11y --config patternfly-a11y.config" }, "dependencies": { - "@patternfly/patternfly": "5.0.0-alpha.74", - "@patternfly/react-charts": "^7.0.0-alpha.35", - "@patternfly/react-code-editor": "^5.0.0-alpha.133", - "@patternfly/react-core": "^5.0.0-alpha.132", - "@patternfly/react-icons": "^5.0.0-alpha.21", - "@patternfly/react-styles": "^5.0.0-alpha.19", - "@patternfly/react-table": "^5.0.0-alpha.136", - "@patternfly/react-tokens": "^5.0.0-alpha.16" + "@patternfly/patternfly": "5.0.0-prerelease.1", + "@patternfly/react-charts": "^7.0.0-prerelease.0", + "@patternfly/react-code-editor": "^5.0.0-prerelease.0", + "@patternfly/react-core": "^5.0.0-prerelease.0", + "@patternfly/react-icons": "^5.0.0-prerelease.0", + "@patternfly/react-styles": "^5.0.0-prerelease.0", + "@patternfly/react-table": "^5.0.0-prerelease.0", + "@patternfly/react-tokens": "^5.0.0-prerelease.0" }, "devDependencies": { "@patternfly/documentation-framework": "^2.0.0-alpha.47", diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json index f0d61c8b70d..f2d69dc461d 100644 --- a/packages/react-icons/package.json +++ b/packages/react-icons/package.json @@ -1,6 +1,6 @@ { "name": "@patternfly/react-icons", - "version": "5.0.0-alpha.21", + "version": "5.0.0-prerelease.0", "description": "PatternFly 4 Icons as React Components", "main": "dist/js/index.js", "module": "dist/esm/index.js", @@ -32,7 +32,7 @@ "@fortawesome/free-brands-svg-icons": "^5.14.0", "@fortawesome/free-regular-svg-icons": "^5.14.0", "@fortawesome/free-solid-svg-icons": "^5.14.0", - "@patternfly/patternfly": "5.0.0-alpha.74", + "@patternfly/patternfly": "5.0.0-prerelease.1", "fs-extra": "^11.1.1", "glob": "^7.1.2", "rimraf": "^2.6.2", diff --git a/packages/react-integration/demo-app-ts/package.json b/packages/react-integration/demo-app-ts/package.json index 6161e36cb17..657596a9329 100644 --- a/packages/react-integration/demo-app-ts/package.json +++ b/packages/react-integration/demo-app-ts/package.json @@ -1,7 +1,7 @@ { "name": "demo-app-ts", "private": true, - "version": "5.0.0-alpha.116", + "version": "5.0.0-prerelease.0", "scripts": { "build:demo-app": "webpack --mode production", "start:demo-app": "webpack-dev-server", @@ -9,7 +9,7 @@ "serve:demo-app": "node scripts/serve" }, "dependencies": { - "@patternfly/react-core": "^5.0.0-alpha.132", + "@patternfly/react-core": "^5.0.0-prerelease.0", "react": "^18", "react-dom": "^18", "react-router": "^5.3.3", diff --git a/packages/react-integration/package.json b/packages/react-integration/package.json index 42991d36b5f..9972bfb0dad 100644 --- a/packages/react-integration/package.json +++ b/packages/react-integration/package.json @@ -1,7 +1,7 @@ { "name": "@patternfly/react-integration", "private": true, - "version": "5.0.0-alpha.52", + "version": "5.0.0-prerelease.0", "description": "Integration testing for PF5 using demo applications", "main": "lib/index.js", "sideEffects": false, diff --git a/packages/react-styles/package.json b/packages/react-styles/package.json index c0af0677d3b..0acf72b87b7 100644 --- a/packages/react-styles/package.json +++ b/packages/react-styles/package.json @@ -1,6 +1,6 @@ { "name": "@patternfly/react-styles", - "version": "5.0.0-alpha.19", + "version": "5.0.0-prerelease.0", "main": "dist/js/index.js", "module": "dist/esm/index.js", "types": "dist/esm/index.d.ts", @@ -19,7 +19,7 @@ "clean": "rimraf dist css" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.74", + "@patternfly/patternfly": "5.0.0-prerelease.1", "camel-case": "^3.0.0", "css": "^2.2.3", "fs-extra": "^11.1.1", diff --git a/packages/react-table/package.json b/packages/react-table/package.json index 7db9be4360c..3c69c71ce15 100644 --- a/packages/react-table/package.json +++ b/packages/react-table/package.json @@ -1,6 +1,6 @@ { "name": "@patternfly/react-table", - "version": "5.0.0-alpha.136", + "version": "5.0.0-prerelease.0", "description": "This library provides a set of React table components for use with the PatternFly 4", "main": "dist/js/index.js", "module": "dist/esm/index.js", @@ -40,10 +40,10 @@ "subpaths": "node scripts/createSubpaths.js" }, "dependencies": { - "@patternfly/react-core": "^5.0.0-alpha.132", - "@patternfly/react-icons": "^5.0.0-alpha.21", - "@patternfly/react-styles": "^5.0.0-alpha.19", - "@patternfly/react-tokens": "^5.0.0-alpha.16", + "@patternfly/react-core": "^5.0.0-prerelease.0", + "@patternfly/react-icons": "^5.0.0-prerelease.0", + "@patternfly/react-styles": "^5.0.0-prerelease.0", + "@patternfly/react-tokens": "^5.0.0-prerelease.0", "lodash": "^4.17.19", "tslib": "^2.5.0" }, diff --git a/packages/react-tokens/package.json b/packages/react-tokens/package.json index 2db12cbcd6c..455bc256765 100644 --- a/packages/react-tokens/package.json +++ b/packages/react-tokens/package.json @@ -1,6 +1,6 @@ { "name": "@patternfly/react-tokens", - "version": "5.0.0-alpha.16", + "version": "5.0.0-prerelease.0", "description": "This library provides access to the design tokens of PatternFly 4 from JavaScript", "main": "dist/js/index.js", "module": "dist/esm/index.js", @@ -29,7 +29,7 @@ "clean": "rimraf dist" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.74", + "@patternfly/patternfly": "5.0.0-prerelease.1", "css": "^2.2.3", "fs-extra": "^11.1.1", "glob": "^7.1.2", diff --git a/yarn.lock b/yarn.lock index 89c1d2290f8..33b3e3d81dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4091,10 +4091,10 @@ puppeteer-cluster "^0.23.0" xmldoc "^1.1.2" -"@patternfly/patternfly@5.0.0-alpha.74": - version "5.0.0-alpha.74" - resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.0.0-alpha.74.tgz#0c716e6d5bb0bfe881f1a8206d8bcd61e81b54b4" - integrity sha512-gxD2cYLroj5N5va0CEiF6t3oTv9tPrVYxL8H2QeYHiW9OwRT7ofa6Cp9BlNI63YZAQqrWQgohTTtEo7db3J3Aw== +"@patternfly/patternfly@5.0.0-prerelease.1": + version "5.0.0-prerelease.1" + resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.0.0-prerelease.1.tgz#89972fa0001c60de947e355c2f3fd2fc1afc346c" + integrity sha512-/PmvrPkPxj0giuTByxC52GzBu7o6i/K8DkhU/t6I/waIaDfanRySJGHt7F2qZGPuBMK2YdzXWuoDw2al7f80mQ== "@phenomnomnominal/tsquery@4.1.1": version "4.1.1" From 770e8fcf20976c2967d4a374031a1eeda028a00e Mon Sep 17 00:00:00 2001 From: nicolethoen Date: Mon, 5 Jun 2023 16:10:10 -0400 Subject: [PATCH 2/2] stop being clever with dry runs --- .github/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/release.sh b/.github/release.sh index d20a9ee0afc..336eb2953e9 100755 --- a/.github/release.sh +++ b/.github/release.sh @@ -18,7 +18,7 @@ LOG=$(git log --format="%s" -1 | grep -Poe "#\d+") PR_NUM=${LOG:1} # yarn run lerna publish --conventional-commits --conventional-prerelease --create-release=github --no-verify-access --dist-tag=prerelease --yes 2>&1 | tee lerna-output.txt -yarn run lerna version --conventional-commits --conventional-prerelease --dist-tag=prerelease --no-private --yes --no-git-tag-version --no-push +yarn run lerna version --conventional-commits --conventional-prerelease --no-private --yes --no-git-tag-version --no-push if grep -i "Successfully published" lerna-output.txt; # Leave a Github comment then