Skip to content

Ensure release script rebases before pushing to master #1158

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

Merged
ap211unitech merged 4 commits into from
Dec 12, 2025
Merged

Ensure release script rebases before pushing to master #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12522bb
fix: ensure release script rebases before pushing to master
ap211unitech Dec 11, 2025
aec54e2
fix: bump to minor version
ap211unitech Dec 11, 2025
1d344bc
fix: correct version number in CHANGELOG for 0.84.0
ap211unitech Dec 12, 2025
016fed5
chore: changed to 0.84.0
ap211unitech Dec 12, 2025
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# CHANGELOG

## 0.84.0

- Write the Buffer Import to necessary Deno build files
- build(dev): ignore removing private fields


## 0.83.1

- Parallelize the tests in `polkadot-exec-node-test`
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"sideEffects": false,
"type": "module",
"version": "0.83.3",
"version": "0.84.0",
"versions": {
"git": "0.83.3",
"npm": "0.83.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"sideEffects": false,
"type": "module",
"version": "0.83.3",
"version": "0.84.0",
"main": "./index.js",
"exports": {
"./globals.d.ts": "./src/globals.d.ts"
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-ts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"sideEffects": false,
"type": "module",
"version": "0.83.3",
"version": "0.84.0",
"main": "./index.js",
"exports": {
"./globals.d.ts": "./src/globals.d.ts"
Expand Down
6 changes: 3 additions & 3 deletions packages/dev/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"sideEffects": false,
"type": "module",
"version": "0.83.3",
"version": "0.84.0",
"bin": {
"polkadot-ci-ghact-build": "./scripts/polkadot-ci-ghact-build.mjs",
"polkadot-ci-ghact-docs": "./scripts/polkadot-ci-ghact-docs.mjs",
Expand Down Expand Up @@ -50,8 +50,8 @@
},
"dependencies": {
"@eslint/js": "^8.56.0",
"@polkadot/dev-test": "^0.83.3",
"@polkadot/dev-ts": "^0.83.3",
"@polkadot/dev-test": "^0.84.0",
"@polkadot/dev-ts": "^0.84.0",
"@rollup/plugin-alias": "^5.1.1",
"@rollup/plugin-commonjs": "^25.0.8",
"@rollup/plugin-dynamic-import-vars": "^2.1.5",
Expand Down
4 changes: 4 additions & 0 deletions packages/dev/scripts/polkadot-ci-ghact-build.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,10 @@ function gitPush () {

skip-checks: true"`);

// Make sure the release commit is on top of the latest master
execGit(`pull --rebase ${repo} master`);

// Now push normally
execGit(`push ${repo} HEAD:${process.env['GITHUB_REF']}`, true);

if (doGHRelease) {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ __metadata:
languageName: node
linkType: hard

"@polkadot/dev-test@npm:^0.83.3, @polkadot/dev-test@workspace:packages/dev-test":
"@polkadot/dev-test@npm:^0.84.0, @polkadot/dev-test@workspace:packages/dev-test":
version: 0.0.0-use.local
resolution: "@polkadot/dev-test@workspace:packages/dev-test"
dependencies:
Expand All @@ -443,7 +443,7 @@ __metadata:
languageName: unknown
linkType: soft

"@polkadot/dev-ts@npm:^0.83.3, @polkadot/dev-ts@workspace:packages/dev-ts":
"@polkadot/dev-ts@npm:^0.84.0, @polkadot/dev-ts@workspace:packages/dev-ts":
version: 0.0.0-use.local
resolution: "@polkadot/dev-ts@workspace:packages/dev-ts"
dependencies:
Expand All @@ -458,8 +458,8 @@ __metadata:
resolution: "@polkadot/dev@workspace:packages/dev"
dependencies:
"@eslint/js": "npm:^8.56.0"
"@polkadot/dev-test": "npm:^0.83.3"
"@polkadot/dev-ts": "npm:^0.83.3"
"@polkadot/dev-test": "npm:^0.84.0"
"@polkadot/dev-ts": "npm:^0.84.0"
"@rollup/plugin-alias": "npm:^5.1.1"
"@rollup/plugin-commonjs": "npm:^25.0.8"
"@rollup/plugin-dynamic-import-vars": "npm:^2.1.5"
Expand Down