Skip to content
This repository was archived by the owner on Aug 2, 2022. It is now read-only.

Commit 32a47e3

Browse files
authored
Merge pull request #10266 from EOSIO/release/2.0.x
Merge release/2.0.x into master for 2.0.12
2 parents 8f29da1 + 86e4ce6 commit 32a47e3

37 files changed

+363
-224
lines changed

.cicd/base-images.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ steps:
3434
no-volume: true
3535
always-pull: true
3636
wait-network: true
37+
pre-execute-sleep: 5
38+
pre-execute-ping-sleep: github.com
3739
vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
3840
failover-registries:
3941
- "registry_1"
@@ -99,6 +101,8 @@ steps:
99101
no-volume: true
100102
always-pull: true
101103
wait-network: true
104+
pre-execute-sleep: 5
105+
pre-execute-ping-sleep: github.com
102106
vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
103107
failover-registries:
104108
- "registry_1"

.cicd/build-scripts.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ steps:
4040
modify-ram: 24
4141
always-pull: true
4242
wait-network: true
43+
pre-execute-sleep: 5
44+
pre-execute-ping-sleep: github.com
4345
vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
4446
failover-registries:
4547
- "registry_1"
@@ -113,6 +115,8 @@ steps:
113115
modify-ram: 24
114116
always-pull: true
115117
wait-network: true
118+
pre-execute-sleep: 5
119+
pre-execute-ping-sleep: github.com
116120
vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
117121
failover-registries:
118122
- "registry_1"

.cicd/generate-pipeline.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ EOF
136136
always-pull: true
137137
debug: true
138138
wait-network: true
139+
pre-execute-sleep: 5
140+
pre-execute-ping-sleep: github.com
139141
failover-registries:
140142
- 'registry_1'
141143
- 'registry_2'
@@ -218,6 +220,8 @@ EOF
218220
always-pull: true
219221
debug: true
220222
wait-network: true
223+
pre-execute-sleep: 5
224+
pre-execute-ping-sleep: github.com
221225
failover-registries:
222226
- 'registry_1'
223227
- 'registry_2'
@@ -274,6 +278,8 @@ EOF
274278
always-pull: true
275279
debug: true
276280
wait-network: true
281+
pre-execute-sleep: 5
282+
pre-execute-ping-sleep: github.com
277283
failover-registries:
278284
- 'registry_1'
279285
- 'registry_2'
@@ -330,6 +336,8 @@ EOF
330336
always-pull: true
331337
debug: true
332338
wait-network: true
339+
pre-execute-sleep: 5
340+
pre-execute-ping-sleep: github.com
333341
failover-registries:
334342
- 'registry_1'
335343
- 'registry_2'
@@ -388,6 +396,8 @@ EOF
388396
always-pull: true
389397
debug: true
390398
wait-network: true
399+
pre-execute-sleep: 5
400+
pre-execute-ping-sleep: github.com
391401
failover-registries:
392402
- 'registry_1'
393403
- 'registry_2'
@@ -568,6 +578,8 @@ cat <<EOF
568578
always-pull: true
569579
debug: true
570580
wait-network: true
581+
pre-execute-sleep: 5
582+
pre-execute-ping-sleep: github.com
571583
failover-registries:
572584
- 'registry_1'
573585
- 'registry_2'

.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l
4343
cd / && \
4444
rm -rf /llvm
4545
# build boost
46-
RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
46+
RUN curl -LO https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
4747
tar -xjf boost_1_71_0.tar.bz2 && \
4848
cd boost_1_71_0 && \
4949
./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \

.cicd/platforms/pinned/centos-7.7-pinned.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l
5252
cd / && \
5353
rm -rf /llvm
5454
# build boost
55-
RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
55+
RUN curl -LO https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
5656
tar -xjf boost_1_71_0.tar.bz2 && \
5757
cd boost_1_71_0 && \
5858
./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \

.cicd/platforms/pinned/macos-10.14-pinned.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ rm -rf clang8
5353
# install boost from source
5454
# Boost Fix: eosio/install/bin/../include/c++/v1/stdlib.h:94:15: fatal error: 'stdlib.h' file not found
5555
export SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"
56-
curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2
56+
curl -LO https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.bz2
5757
tar -xjf boost_1_71_0.tar.bz2
5858
cd boost_1_71_0
5959
./bootstrap.sh --prefix=/usr/local

.cicd/platforms/pinned/ubuntu-16.04-pinned.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l
4444
cd / && \
4545
rm -rf /llvm
4646
# build boost
47-
RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
47+
RUN curl -LO https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
4848
tar -xjf boost_1_71_0.tar.bz2 && \
4949
cd boost_1_71_0 && \
5050
./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \

.cicd/platforms/pinned/ubuntu-18.04-pinned.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l
4646
cd / && \
4747
rm -rf /llvm
4848
# build boost
49-
RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
49+
RUN curl -LO https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
5050
tar -xjf boost_1_71_0.tar.bz2 && \
5151
cd boost_1_71_0 && \
5252
./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \

.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
1616
cd / && \
1717
rm -rf cmake-3.13.2.tar.gz /cmake-3.13.2
1818
# build boost
19-
RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
19+
RUN curl -LO https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
2020
tar -xjf boost_1_71_0.tar.bz2 && \
2121
cd boost_1_71_0 && \
2222
./bootstrap.sh --prefix=/usr/local && \

.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
2121
cd / && \
2222
rm -rf cmake-3.13.2.tar.gz /cmake-3.13.2
2323
# build boost
24-
RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
24+
RUN curl -LO https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
2525
source /opt/rh/devtoolset-8/enable && \
2626
source /opt/rh/rh-python36/enable && \
2727
tar -xjf boost_1_71_0.tar.bz2 && \

0 commit comments

Comments
 (0)