Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

Commit 5ee54b7

Browse files
niklasad1Andronik Ordian
authored andcommitted
[stable]: backports (#11114)
* [spec] fix rinkeby spec (#11108) * use images from our registry (#11105)
1 parent 06c7096 commit 5ee54b7

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

.gitlab-ci.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ stages:
44
- publish
55
- optional
66

7-
image: parity/parity-ci-linux:latest
7+
image: ${REGISTRY}/parity-ci-linux:latest
88
variables:
99
GIT_STRATEGY: fetch
1010
GIT_SUBMODULE_STRATEGY: recursive
1111
CI_SERVER_NAME: "GitLab CI"
1212
CARGO_HOME: "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_JOB_NAME}"
1313
SCCACHE_DIR: "/ci-cache/${CI_PROJECT_NAME}/sccache"
1414
CARGO_TARGET: x86_64-unknown-linux-gnu
15+
REGISTRY: registry.parity.io/parity/infrastructure/scripts
1516

1617

1718
.releaseable_branches: # list of git refs for building GitLab artifacts (think "pre-release binaries")
@@ -143,7 +144,7 @@ test-linux-nightly:
143144

144145
build-android:
145146
<<: *build-on-linux
146-
image: parity/parity-ci-android:stretch
147+
image: ${REGISTRY}/parity-ci-android:stretch
147148
variables:
148149
CARGO_TARGET: armv7-linux-androideabi
149150

@@ -154,21 +155,21 @@ build-linux:
154155
build-linux-i386:
155156
<<: *build-on-linux
156157
only: *releaseable_branches
157-
image: parity/parity-ci-i386:latest
158+
image: ${REGISTRY}/parity-ci-i386:latest
158159
variables:
159160
CARGO_TARGET: i686-unknown-linux-gnu
160161

161162
build-linux-arm64:
162163
<<: *build-on-linux
163164
only: *releaseable_branches
164-
image: parity/parity-ci-arm64:latest
165+
image: ${REGISTRY}/parity-ci-arm64:latest
165166
variables:
166167
CARGO_TARGET: aarch64-unknown-linux-gnu
167168

168169
build-linux-armhf:
169170
<<: *build-on-linux
170171
only: *releaseable_branches
171-
image: parity/parity-ci-armhf:latest
172+
image: ${REGISTRY}/parity-ci-armhf:latest
172173
variables:
173174
CARGO_TARGET: armv7-unknown-linux-gnueabihf
174175

@@ -307,7 +308,7 @@ publish-onchain-manually:
307308
when: manual
308309

309310
publish-release-awss3-nightly: &publish-release-awss3
310-
image: parity/awscli:latest
311+
image: ${REGISTRY}/awscli:latest
311312
stage: publish
312313
only:
313314
- nightly
@@ -341,7 +342,7 @@ publish-release-awss3-manually:
341342

342343
publish-docs:
343344
stage: publish
344-
image: parity/parity-ci-docs:latest
345+
image: ${REGISTRY}/parity-ci-docs:latest
345346
only:
346347
- tags
347348
except:

ethcore/res/ethereum/rinkeby.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
}
123123
},
124124
"0x0000000000000000000000000000000000000006": {
125+
"balance": "0x1",
125126
"builtin": {
126127
"name": "alt_bn128_add",
127128
"activate_at": "0xfcc25",
@@ -135,6 +136,7 @@
135136
}
136137
},
137138
"0x0000000000000000000000000000000000000007": {
139+
"balance": "0x1",
138140
"builtin": {
139141
"name": "alt_bn128_mul",
140142
"activate_at": "0xfcc25",
@@ -148,6 +150,7 @@
148150
}
149151
},
150152
"0x0000000000000000000000000000000000000008": {
153+
"balance": "0x1",
151154
"builtin": {
152155
"name": "alt_bn128_pairing",
153156
"activate_at": "0xfcc25",

0 commit comments

Comments
 (0)