Skip to content

Commit

Permalink
0.53.7 (#476)
Browse files Browse the repository at this point in the history
* 0.53.7

* Add docker:build npm action

* Adjust docker build script

* Bring back root install

* Adjust docker build for test run

* Retry with local run
  • Loading branch information
jacogr authored Mar 25, 2023
1 parent aa071b9 commit bd0e45c
Show file tree
Hide file tree
Showing 16 changed files with 404 additions and 448 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- uses: jacogr/action-merge@d2d64b4545acd93b0a9575177d3d215ae3f92029
with:
checks: pr (build),pr (lint),pr (test)
checks: pr (build),pr (lint),pr (test), pr (docker:build)
labels: -auto
strategy: squash
token: ${{ secrets.GH_PAT_BOT }}
2 changes: 1 addition & 1 deletion .github/workflows/pr-any.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
continue-on-error: true
strategy:
matrix:
step: ['lint', 'test', 'build']
step: ['lint', 'test', 'build', 'docker:build']
runs-on: ubuntu-latest
env:
YARN_ENABLE_SCRIPTS: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ jobs:
node-version: 'lts/*'
- name: docker
run: |
./docker/build.sh build
./docker/build.sh publish
yarn docker:build
yarn docker:publish
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
build/
build-*/
coverage/
docker/Dockerfile
node_modules/
tmp/
.DS_Store
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# CHANGELOG

## 0.53.7 Mar 25, 2023

Changes:

- Upgrade to `@polkadot/api` 10.2.1
- Upgrade to `@polkadot/util` 11.1.2


## 0.53.6 Mar 19, 2023

Changes:
Expand Down
24 changes: 0 additions & 24 deletions docker/Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion docker/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN apt-get update && \
RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -
RUN apt-get install -y nodejs

# env variable works around gyp install (secp256k1) with root permissions
# install latest from npm (install as root, we assume we are secure inside...)
RUN NPM_CONFIG_USER=root npm install -g @polkadot/api-cli@VERSION @polkadot/json-serve@VERSION @polkadot/metadata-cmp@VERSION @polkadot/monitor-rpc@VERSION @polkadot/signer-cli@VERSION @polkadot/vanitygen@VERSION

# copy the cli wrapper to this container
Expand Down
9 changes: 6 additions & 3 deletions docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,23 @@ REPO="jacogr"

# extract the current npm version from package.json
VERSION=$(cat package.json \
| grep version \
| grep npm \
| head -1 \
| awk -F: '{ print $2 }' \
| sed 's/[",]//g' \
| sed 's/ //g')

# helper function for the build logic
function build () {
echo "*** Creating Dockerfile from latest npm version"
echo "*** Creating Dockerfile from npm version $VERSION"
sed "s/VERSION/$VERSION/g" docker/Dockerfile.tmpl > docker/Dockerfile

echo "*** Building $NAME"
echo "*** Building $NAME:$VERSION"
docker build -t $NAME docker

echo "*** Testing $NAME:$VERSION"
docker run $NAME api --help

exit 0
}

Expand Down
22 changes: 12 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"sideEffects": false,
"type": "module",
"version": "0.53.6",
"version": "0.53.7",
"versions": {
"git": "0.53.6",
"npm": "0.53.6"
Expand All @@ -26,6 +26,8 @@
"build": "polkadot-dev-build-ts",
"build:release": "polkadot-ci-ghact-build",
"clean": "polkadot-dev-clean-build",
"docker:build": "./docker/build.sh build",
"docker:publish": "./docker/build.sh publish",
"lint": "polkadot-dev-run-lint",
"postinstall": "polkadot-dev-yarn-only",
"run:api": "node --loader @polkadot/dev-ts ./packages/api-cli/src/runcli.ts",
Expand All @@ -37,17 +39,17 @@
"test": "yarn run:api --help && yarn run:json --help && yarn run:metadata --help && yarn run:monitor --help && yarn run:signer --help && yarn run:vanity --help"
},
"devDependencies": {
"@polkadot/dev": "^0.72.15",
"@types/node": "^18.15.3",
"@types/yargs": "^17.0.22"
"@polkadot/dev": "^0.72.24",
"@types/node": "^18.15.9",
"@types/yargs": "^17.0.23"
},
"resolutions": {
"@polkadot/api": "^10.1.4",
"@polkadot/api-derive": "^10.1.4",
"@polkadot/keyring": "^11.1.1",
"@polkadot/types": "^10.1.4",
"@polkadot/util": "^11.1.1",
"@polkadot/util-crypto": "^11.1.1",
"@polkadot/api": "^10.2.1",
"@polkadot/api-derive": "^10.2.1",
"@polkadot/keyring": "^11.1.2",
"@polkadot/types": "^10.2.1",
"@polkadot/util": "^11.1.2",
"@polkadot/util-crypto": "^11.1.2",
"typescript": "^5.0.2"
}
}
16 changes: 8 additions & 8 deletions packages/api-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@
},
"sideEffects": false,
"type": "module",
"version": "0.53.6",
"version": "0.53.7",
"main": "index.js",
"bin": {
"polkadot-js-api": "./runcli.mjs"
},
"dependencies": {
"@polkadot/api": "^10.1.4",
"@polkadot/keyring": "^11.1.1",
"@polkadot/types": "^10.1.4",
"@polkadot/util": "^11.1.1",
"@polkadot/util-crypto": "^11.1.1",
"@polkadot/api": "^10.2.1",
"@polkadot/keyring": "^11.1.2",
"@polkadot/types": "^10.2.1",
"@polkadot/util": "^11.1.2",
"@polkadot/util-crypto": "^11.1.2",
"tslib": "^2.5.0",
"yargs": "^17.7.1"
},
"devDependencies": {
"@types/node": "^18.15.3",
"@types/yargs": "^17.0.22"
"@types/node": "^18.15.9",
"@types/yargs": "^17.0.23"
}
}
16 changes: 8 additions & 8 deletions packages/json-serve/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
},
"sideEffects": false,
"type": "module",
"version": "0.53.6",
"version": "0.53.7",
"main": "index.js",
"bin": {
"polkadot-js-json-serve": "./runcli.mjs"
},
"dependencies": {
"@polkadot/api": "^10.1.4",
"@polkadot/api-augment": "^10.1.4",
"@polkadot/api-derive": "^10.1.4",
"@polkadot/types": "^10.1.4",
"@polkadot/util": "^11.1.1",
"@polkadot/api": "^10.2.1",
"@polkadot/api-augment": "^10.2.1",
"@polkadot/api-derive": "^10.2.1",
"@polkadot/types": "^10.2.1",
"@polkadot/util": "^11.1.2",
"koa": "^2.14.1",
"koa-route": "^3.2.0",
"tslib": "^2.5.0",
Expand All @@ -34,7 +34,7 @@
"devDependencies": {
"@types/koa": "^2.13.5",
"@types/koa-route": "^3.2.5",
"@types/node": "^18.15.3",
"@types/yargs": "^17.0.22"
"@types/node": "^18.15.9",
"@types/yargs": "^17.0.23"
}
}
14 changes: 7 additions & 7 deletions packages/metadata-cmp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@
},
"sideEffects": false,
"type": "module",
"version": "0.53.6",
"version": "0.53.7",
"main": "index.js",
"bin": {
"polkadot-js-metadata-cmp": "./runcli.mjs"
},
"dependencies": {
"@polkadot/api": "^10.1.4",
"@polkadot/keyring": "^11.1.1",
"@polkadot/types": "^10.1.4",
"@polkadot/util": "^11.1.1",
"@polkadot/api": "^10.2.1",
"@polkadot/keyring": "^11.1.2",
"@polkadot/types": "^10.2.1",
"@polkadot/util": "^11.1.2",
"tslib": "^2.5.0",
"yargs": "^17.7.1"
},
"devDependencies": {
"@types/node": "^18.15.3",
"@types/yargs": "^17.0.22"
"@types/node": "^18.15.9",
"@types/yargs": "^17.0.23"
}
}
12 changes: 6 additions & 6 deletions packages/monitor-rpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
},
"sideEffects": false,
"type": "module",
"version": "0.53.6",
"version": "0.53.7",
"main": "index.js",
"bin": {
"polkadot-js-monitor": "./runcli.mjs"
},
"dependencies": {
"@polkadot/api": "^10.1.4",
"@polkadot/types": "^10.1.4",
"@polkadot/util": "^11.1.1",
"@polkadot/api": "^10.2.1",
"@polkadot/types": "^10.2.1",
"@polkadot/util": "^11.1.2",
"koa": "^2.14.1",
"koa-route": "^3.2.0",
"tslib": "^2.5.0",
Expand All @@ -32,7 +32,7 @@
"devDependencies": {
"@types/koa": "^2.13.5",
"@types/koa-route": "^3.2.5",
"@types/node": "^18.15.3",
"@types/yargs": "^17.0.22"
"@types/node": "^18.15.9",
"@types/yargs": "^17.0.23"
}
}
18 changes: 9 additions & 9 deletions packages/signer-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@
},
"sideEffects": false,
"type": "module",
"version": "0.53.6",
"version": "0.53.7",
"main": "index.js",
"bin": {
"polkadot-js-signer": "./runcli.mjs"
},
"dependencies": {
"@polkadot/api": "^10.1.4",
"@polkadot/api-cli": "^0.53.6",
"@polkadot/keyring": "^11.1.1",
"@polkadot/types": "^10.1.4",
"@polkadot/util": "^11.1.1",
"@polkadot/util-crypto": "^11.1.1",
"@polkadot/api": "^10.2.1",
"@polkadot/api-cli": "^0.53.7",
"@polkadot/keyring": "^11.1.2",
"@polkadot/types": "^10.2.1",
"@polkadot/util": "^11.1.2",
"@polkadot/util-crypto": "^11.1.2",
"tslib": "^2.5.0",
"yargs": "^17.7.1"
},
"devDependencies": {
"@types/node": "^18.15.3",
"@types/yargs": "^17.0.22"
"@types/node": "^18.15.9",
"@types/yargs": "^17.0.23"
}
}
10 changes: 5 additions & 5 deletions packages/vanitygen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
},
"sideEffects": false,
"type": "module",
"version": "0.53.6",
"version": "0.53.7",
"main": "index.js",
"bin": {
"polkadot-js-vanitygen": "./runcli.mjs"
},
"dependencies": {
"@polkadot/util": "^11.1.1",
"@polkadot/util-crypto": "^11.1.1",
"@polkadot/util": "^11.1.2",
"@polkadot/util-crypto": "^11.1.2",
"tslib": "^2.5.0",
"yargs": "^17.7.1"
},
"devDependencies": {
"@types/node": "^18.15.3",
"@types/yargs": "^17.0.22"
"@types/node": "^18.15.9",
"@types/yargs": "^17.0.23"
}
}
Loading

0 comments on commit bd0e45c

Please sign in to comment.