grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[stable]: backports (#11114)

Browse Source 
* [spec] fix rinkeby spec (#11108)

* use images from our registry (#11105)
This commit is contained in:
Niklas Adolfsson 2019-10-02 12:23:20 +02:00 committed by Andronik Ordian
parent 06c7096054
commit 5ee54b7298
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitlab-ci.yml
View File

@ -4,7 +4,7 @@ stages:
- publish - publish
- optional - optional
image: parity/parity-ci-linux:latest image: ${REGISTRY}/parity-ci-linux:latest
variables: variables:
GIT_STRATEGY: fetch GIT_STRATEGY: fetch
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
@ -12,6 +12,7 @@ variables:
CARGO_HOME: "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_JOB_NAME}" CARGO_HOME: "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_JOB_NAME}"
SCCACHE_DIR: "/ci-cache/${CI_PROJECT_NAME}/sccache" SCCACHE_DIR: "/ci-cache/${CI_PROJECT_NAME}/sccache"
CARGO_TARGET: x86_64-unknown-linux-gnu CARGO_TARGET: x86_64-unknown-linux-gnu
REGISTRY: registry.parity.io/parity/infrastructure/scripts
.releaseable_branches: # list of git refs for building GitLab artifacts (think "pre-release binaries") .releaseable_branches: # list of git refs for building GitLab artifacts (think "pre-release binaries")
@ -143,7 +144,7 @@ test-linux-nightly:
build-android: build-android:
<<: *build-on-linux <<: *build-on-linux
image: parity/parity-ci-android:stretch image: ${REGISTRY}/parity-ci-android:stretch
variables: variables:
CARGO_TARGET: armv7-linux-androideabi CARGO_TARGET: armv7-linux-androideabi
@ -154,21 +155,21 @@ build-linux:
build-linux-i386: build-linux-i386:
<<: *build-on-linux <<: *build-on-linux
only: *releaseable_branches only: *releaseable_branches
image: parity/parity-ci-i386:latest image: ${REGISTRY}/parity-ci-i386:latest
variables: variables:
CARGO_TARGET: i686-unknown-linux-gnu CARGO_TARGET: i686-unknown-linux-gnu
build-linux-arm64: build-linux-arm64:
<<: *build-on-linux <<: *build-on-linux
only: *releaseable_branches only: *releaseable_branches
image: parity/parity-ci-arm64:latest image: ${REGISTRY}/parity-ci-arm64:latest
variables: variables:
CARGO_TARGET: aarch64-unknown-linux-gnu CARGO_TARGET: aarch64-unknown-linux-gnu
build-linux-armhf: build-linux-armhf:
<<: *build-on-linux <<: *build-on-linux
only: *releaseable_branches only: *releaseable_branches
image: parity/parity-ci-armhf:latest image: ${REGISTRY}/parity-ci-armhf:latest
variables: variables:
CARGO_TARGET: armv7-unknown-linux-gnueabihf CARGO_TARGET: armv7-unknown-linux-gnueabihf
@ -307,7 +308,7 @@ publish-onchain-manually:
when: manual when: manual
publish-release-awss3-nightly: &publish-release-awss3 publish-release-awss3-nightly: &publish-release-awss3
image: parity/awscli:latest image: ${REGISTRY}/awscli:latest
stage: publish stage: publish
only: only:
- nightly - nightly
@ -341,7 +342,7 @@ publish-release-awss3-manually:
publish-docs: publish-docs:
stage: publish stage: publish
image: parity/parity-ci-docs:latest image: ${REGISTRY}/parity-ci-docs:latest
only: only:
- tags - tags
except: except:

3
ethcore/res/ethereum/rinkeby.json
View File

@ -122,6 +122,7 @@
} }
}, },
"0x0000000000000000000000000000000000000006": { "0x0000000000000000000000000000000000000006": {
"balance": "0x1",
"builtin": { "builtin": {
"name": "alt_bn128_add", "name": "alt_bn128_add",
"activate_at": "0xfcc25", "activate_at": "0xfcc25",
@ -135,6 +136,7 @@
} }
}, },
"0x0000000000000000000000000000000000000007": { "0x0000000000000000000000000000000000000007": {
"balance": "0x1",
"builtin": { "builtin": {
"name": "alt_bn128_mul", "name": "alt_bn128_mul",
"activate_at": "0xfcc25", "activate_at": "0xfcc25",
@ -148,6 +150,7 @@
} }
}, },
"0x0000000000000000000000000000000000000008": { "0x0000000000000000000000000000000000000008": {
"balance": "0x1",
"builtin": { "builtin": {
"name": "alt_bn128_pairing", "name": "alt_bn128_pairing",
"activate_at": "0xfcc25", "activate_at": "0xfcc25",