Skip to content

Commit

Permalink
Bump API, fix CI publish (#1722)
Browse files Browse the repository at this point in the history
* Bump API, fix CI publish

* Add ia8n build to CI

* Update i18n strings

* Bump deps
  • Loading branch information
jacogr authored Oct 14, 2019
1 parent 6c6ba25 commit c086fa5
Show file tree
Hide file tree
Showing 14 changed files with 282 additions and 210 deletions.
19 changes: 18 additions & 1 deletion .github/workflows/pr-any.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,21 @@ jobs:
- name: build
run: |
yarn install --frozen-lockfile
yarn build
yarn build:code
build_i18n:
name: Build i18n
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: build
run: |
yarn install --frozen-lockfile
yarn build:i18n
7 changes: 4 additions & 3 deletions .github/workflows/push-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:
- master

jobs:
merge:
name: Merge
build_code:
name: Build Code
if: "! contains(github.event.head_commit.message, '[CI Skip]')"
runs-on: ubuntu-latest
strategy:
Expand All @@ -21,10 +21,11 @@ jobs:
- name: build
env:
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
GH_PAGES_SRC: packages/apps/build
GH_PAT: ${{ secrets.GH_PAT }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: |
yarn install --frozen-lockfile
yarn polkadot-dev-ghact-build
yarn polkadot-dev-ghact-deploy
yarn polkadot-dev-ghact-docs
19 changes: 10 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"packages/*"
],
"resolutions": {
"@polkadot/api": "^0.95.0-beta.15",
"@polkadot/api-contract": "^0.95.0-beta.15",
"@polkadot/api": "^0.95.0-beta.17",
"@polkadot/api-contract": "^0.95.0-beta.17",
"@polkadot/keyring": "^1.5.1",
"@polkadot/types": "^0.95.0-beta.15",
"@polkadot/types": "^0.95.0-beta.17",
"@polkadot/util": "^1.5.1",
"@polkadot/util-crypto": "^1.5.1",
"@types/styled-components": "4.1.8",
Expand All @@ -22,10 +22,12 @@
},
"scripts": {
"analyze": "yarn run build && cd packages/apps && yarn run source-map-explorer build/main.*.js",
"build": "NODE_ENV=production polkadot-dev-build-ts",
"check": "yarn lint",
"build": "yarn run build:code && build:i18n",
"build:code": "NODE_ENV=production polkadot-dev-build-ts",
"build:i18n": "i18next-scanner --config i18next-scanner.config.js",
"docs": "echo \"skipping docs\"",
"clean": "polkadot-dev-clean-build",
"i18n-scanner": "i18next-scanner --config i18next-scanner.config.js",
"clean:i18n": "rm -rf packages/apps/public/locales/en && mkdir -p packages/apps/public/locales/en",
"lint": "eslint --ext .js,.jsx,.ts,.tsx . && tsc --noEmit --pretty",
"postinstall": "polkadot-dev-yarn-only",
"test": "echo \"skipping tests\"",
Expand All @@ -35,11 +37,10 @@
"devDependencies": {
"@babel/core": "^7.6.4",
"@babel/runtime": "^7.6.3",
"@polkadot/dev-react": "^0.32.0-beta.9",
"@polkadot/ts": "^0.1.80",
"@polkadot/dev-react": "^0.32.0-beta.10",
"@polkadot/ts": "^0.1.81",
"autoprefixer": "^9.6.4",
"empty": "^0.10.1",
"gh-pages": "^2.1.1",
"html-loader": "^0.5.5",
"i18next-scanner": "^2.10.3",
"markdown-loader": "^5.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/app-accounts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@babel/runtime": "^7.6.3",
"@polkadot/react-components": "^0.36.0-beta.72",
"@polkadot/react-qr": "^0.46.0-beta.10",
"@polkadot/react-qr": "^0.46.0-beta.11",
"@types/file-saver": "^2.0.0",
"@types/yargs": "^13.0.2",
"babel-plugin-module-resolver": "^3.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/app-contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.6.3",
"@polkadot/api-contract": "^0.95.0-beta.15",
"@polkadot/api-contract": "^0.95.0-beta.17",
"@polkadot/react-components": "^0.36.0-beta.72"
}
}
2 changes: 1 addition & 1 deletion packages/apps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@babel/runtime": "^7.6.3",
"@polkadot/react-components": "^0.36.0-beta.72",
"@polkadot/react-signer": "^0.36.0-beta.72",
"@polkadot/ui-assets": "^0.46.0-beta.10",
"@polkadot/ui-assets": "^0.46.0-beta.11",
"query-string": "^6.8.3"
}
}
5 changes: 4 additions & 1 deletion packages/apps/public/locales/en/app-contracts.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"You are using an ABI with an outdated format. Please generate a new one.": "You are using an ABI with an outdated format. Please generate a new one.",
"invalid ABI file selected": "invalid ABI file selected",
"click to select or drag and drop a JSON ABI file": "click to select or drag and drop a JSON ABI file",
"The code hash for the on-chain deployed code.": "The code hash for the on-chain deployed code.",
"code hash": "code hash",
"Save": "Save",
"Add an existing code hash": "Add an existing code hash",
"ABI": "ABI",
"Forget this code hash": "Forget this code hash",
"deploy": "deploy",
"Deploy this code hash as a smart contract": "Deploy this code hash as a smart contract",
Expand Down Expand Up @@ -33,6 +35,7 @@
"Cancel": "Cancel",
"Call": "Call",
"address forgotten": "address forgotten",
"Messages": "Messages",
"Forget this contract": "Forget this contract",
"execute": "execute",
"Call a method on this contract": "Call a method on this contract",
Expand All @@ -50,6 +53,6 @@
"deployment account": "deployment account",
"Confirm ABI removal": "Confirm ABI removal",
"You are about to remove this code's ABI. Once completed, should you need to access it again, you will have to manually re-upload it.": "You are about to remove this code's ABI. Once completed, should you need to access it again, you will have to manually re-upload it.",
"This operaion does not impact the associated on-chain code or any of its contracts.": "This operaion does not impact the associated on-chain code or any of its contracts.",
"This operation does not impact the associated on-chain code or any of its contracts.": "This operation does not impact the associated on-chain code or any of its contracts.",
"Remove": "Remove"
}
2 changes: 1 addition & 1 deletion packages/apps/public/locales/en/app-staking.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"The Threshold must lower than 11": "The Threshold must lower than 11",
"Nominate Validators": "Nominate Validators",
"controller account": "controller account",
"Stash accounts that are to be nominated. Block rewards are split between validators and nominators": "Stash accounts that are to be nominated. Block rewards are split between validators and nominators",
"Stash accounts that are to be nominated. Block rewards are split between validators and nominators. Only 16 nominees will be taken into account.": "Stash accounts that are to be nominated. Block rewards are split between validators and nominators. Only 16 nominees will be taken into account.",
"nominate the following addresses": "nominate the following addresses",
"select accounts(s) nominate": "select accounts(s) nominate",
"Warning - Changing the controller while validating will modify the associated session account. It is advised to stop validating before changing the controller account.": "Warning - Changing the controller while validating will modify the associated session account. It is advised to stop validating before changing the controller account.",
Expand Down
10 changes: 6 additions & 4 deletions packages/apps/public/locales/en/react-components.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
"clipboard": "clipboard",
"address copied": "address copied",
"You are about to remove this account from your list of available accounts. Once completed, should you need to access it again, you will have to re-create the account either via seed or via a backup file.": "You are about to remove this account from your list of available accounts. Once completed, should you need to access it again, you will have to re-create the account either via seed or via a backup file.",
"This operaion does not remove the history of the account from the chain, nor any associated funds from the account. The forget operation only limits your access to the account on this browser.": "This operaion does not remove the history of the account from the chain, nor any associated funds from the account. The forget operation only limits your access to the account on this browser.",
"This operation does not remove the history of the account from the chain, nor any associated funds from the account. The forget operation only limits your access to the account on this browser.": "This operation does not remove the history of the account from the chain, nor any associated funds from the account. The forget operation only limits your access to the account on this browser.",
"You are about to remove this address from your address book. Once completed, should you need to access it again, you will have to re-add the address.": "You are about to remove this address from your address book. Once completed, should you need to access it again, you will have to re-add the address.",
"This operation does not remove the history of the account from the chain, nor any associated funds from the account. The forget operation only limits your access to the address on this browser.": "This operation does not remove the history of the account from the chain, nor any associated funds from the account. The forget operation only limits your access to the address on this browser.",
"You are about to remove this contract from your list of available contracts. Once completed, should you need to access it again, you will have to manually add the contract's address in the Instantiate tab.": "You are about to remove this contract from your list of available contracts. Once completed, should you need to access it again, you will have to manually add the contract's address in the Instantiate tab.",
"This operaion does not remove the history of the contract from the chain, nor any associated funds from its account. The forget operation only limits your access to the contract on this browser.": "This operaion does not remove the history of the contract from the chain, nor any associated funds from its account. The forget operation only limits your access to the contract on this browser.",
"This operation does not remove the history of the contract from the chain, nor any associated funds from its account. The forget operation only limits your access to the contract on this browser.": "This operation does not remove the history of the contract from the chain, nor any associated funds from its account. The forget operation only limits your access to the contract on this browser.",
"You are about to remove this code from your list of available code hashes. Once completed, should you need to access it again, you will have to manually add the code hash again.": "You are about to remove this code from your list of available code hashes. Once completed, should you need to access it again, you will have to manually add the code hash again.",
"This operaion does not remove the uploaded code WASM and ABI from the chain, nor any deployed contracts. The forget operation only limits your access to the code on this browser.": "This operaion does not remove the uploaded code WASM and ABI from the chain, nor any deployed contracts. The forget operation only limits your access to the code on this browser.",
"This operation does not remove the uploaded code WASM and ABI from the chain, nor any deployed contracts. The forget operation only limits your access to the code on this browser.": "This operation does not remove the uploaded code WASM and ABI from the chain, nor any deployed contracts. The forget operation only limits your access to the code on this browser.",
"Confirm account removal": "Confirm account removal",
"Confirm address removal": "Confirm address removal",
"Confirm contract removal": "Confirm contract removal",
Expand All @@ -39,7 +39,9 @@
"{{name}} ({{size}} bytes)": "{{name}} ({{size}} bytes)",
"Positive number": "Positive number",
"View this {{type}} on Polkascan.io": "View this {{type}} on Polkascan.io",
"Remove ABI": "Remove ABI",
"Mutates contract state": "Mutates contract state",
"Call this message": "Call this message",
"Deploy with this constructor": "Deploy with this constructor",
"Reported offline {{count}} times, last at {{blockNumber}}": "Reported offline {{count}} times, last at {{blockNumber}}",
"Reported online at #{{blockNumber}}": "Reported online at #{{blockNumber}}",
"Reported online in the current session": "Reported online in the current session",
Expand Down
17 changes: 11 additions & 6 deletions packages/apps/public/locales/en/ui.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,11 @@
"Redeem": "",
"invalid ABI file selected": "",
"click to select or drag and drop a JSON ABI file": "",
"You are using an ABI with an outdated format. Please generate a new one.": "",
"Add an existing code hash": "",
"The code hash for the on-chain deployed code.": "",
"code hash": "",
"ABI": "",
"Forget this code hash": "",
"deploy": "",
"Deploy this code hash as a smart contract": "",
Expand All @@ -136,6 +138,7 @@
"The maximum amount of gas that can be used by this deployment, if the code requires more, the deployment will fail.": "",
"maximum gas allowed": "",
"Call": "",
"Messages": "",
"Forget this contract": "",
"execute": "",
"Call a method on this contract": "",
Expand All @@ -153,7 +156,7 @@
"deployment account": "",
"Confirm ABI removal": "",
"You are about to remove this code's ABI. Once completed, should you need to access it again, you will have to manually re-upload it.": "",
"This operaion does not impact the associated on-chain code or any of its contracts.": "",
"This operation does not impact the associated on-chain code or any of its contracts.": "",
"Remove": "",
"Council overview": "",
"Motions": "",
Expand Down Expand Up @@ -354,7 +357,7 @@
"The Threshold must lower than 11": "",
"Nominate Validators": "",
"controller account": "",
"Stash accounts that are to be nominated. Block rewards are split between validators and nominators": "",
"Stash accounts that are to be nominated. Block rewards are split between validators and nominators. Only 16 nominees will be taken into account.": "",
"nominate the following addresses": "",
"select accounts(s) nominate": "",
"Warning - Changing the controller while validating will modify the associated session account. It is advised to stop validating before changing the controller account.": "",
Expand Down Expand Up @@ -511,13 +514,13 @@
"clipboard": "",
"address copied": "",
"You are about to remove this account from your list of available accounts. Once completed, should you need to access it again, you will have to re-create the account either via seed or via a backup file.": "",
"This operaion does not remove the history of the account from the chain, nor any associated funds from the account. The forget operation only limits your access to the account on this browser.": "",
"This operation does not remove the history of the account from the chain, nor any associated funds from the account. The forget operation only limits your access to the account on this browser.": "",
"You are about to remove this address from your address book. Once completed, should you need to access it again, you will have to re-add the address.": "",
"This operation does not remove the history of the account from the chain, nor any associated funds from the account. The forget operation only limits your access to the address on this browser.": "",
"You are about to remove this contract from your list of available contracts. Once completed, should you need to access it again, you will have to manually add the contract's address in the Instantiate tab.": "",
"This operaion does not remove the history of the contract from the chain, nor any associated funds from its account. The forget operation only limits your access to the contract on this browser.": "",
"This operation does not remove the history of the contract from the chain, nor any associated funds from its account. The forget operation only limits your access to the contract on this browser.": "",
"You are about to remove this code from your list of available code hashes. Once completed, should you need to access it again, you will have to manually add the code hash again.": "",
"This operaion does not remove the uploaded code WASM and ABI from the chain, nor any deployed contracts. The forget operation only limits your access to the code on this browser.": "",
"This operation does not remove the uploaded code WASM and ABI from the chain, nor any deployed contracts. The forget operation only limits your access to the code on this browser.": "",
"Confirm account removal": "",
"Confirm address removal": "",
"Confirm contract removal": "",
Expand All @@ -527,7 +530,9 @@
"{{name}} ({{size}} bytes)": "",
"Positive number": "",
"View this {{type}} on Polkascan.io": "",
"Remove ABI": "",
"Mutates contract state": "",
"Call this message": "",
"Deploy with this constructor": "",
"Reported offline {{count}} times, last at {{blockNumber}}": "",
"Reported online at #{{blockNumber}}": "",
"Reported online in the current session": "",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme",
"dependencies": {
"@babel/runtime": "^7.6.3",
"@polkadot/api": "^0.95.0-beta.15",
"@polkadot/extension-dapp": "^0.13.0-beta.9",
"@polkadot/api": "^0.95.0-beta.17",
"@polkadot/extension-dapp": "^0.13.0-beta.10",
"edgeware-node-types": "^1.0.10",
"rxjs-compat": "^6.5.3"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/react-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"@babel/runtime": "^7.6.3",
"@polkadot/keyring": "^1.5.1",
"@polkadot/react-api": "^0.36.0-beta.72",
"@polkadot/react-identicon": "^0.46.0-beta.10",
"@polkadot/react-identicon": "^0.46.0-beta.11",
"@polkadot/react-query": "^0.36.0-beta.72",
"@polkadot/ui-keyring": "^0.46.0-beta.10",
"@polkadot/ui-settings": "^0.46.0-beta.10",
"@polkadot/ui-keyring": "^0.46.0-beta.11",
"@polkadot/ui-settings": "^0.46.0-beta.11",
"@types/chart.js": "^2.8.7",
"@types/i18next": "^13.0.0",
"@types/react-copy-to-clipboard": "^4.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-signer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"dependencies": {
"@babel/runtime": "^7.6.3",
"@polkadot/react-components": "^0.36.0-beta.72",
"@polkadot/react-qr": "^0.46.0-beta.10"
"@polkadot/react-qr": "^0.46.0-beta.11"
}
}
Loading

0 comments on commit c086fa5

Please sign in to comment.