Skip to content

Commit 5603077

Browse files
chorrellchorrell
authored
Merge pull request #933 from tianon/revert
Revert "Enable ccache for Alpine builds on Travis CI" and "Fix Alpine build with the missing `|| true`"
2 parents b9a24d8 + 77c2d08 commit 5603077

File tree

8 files changed

+0
-127
lines changed

8 files changed

+0
-127
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,6 @@ services:
3030
echo "Skip build of $Dockerfile as it's not changed."
3131
exit
3232
fi
33-
if [ "alpine" = "$VARIANT" ]; then
34-
mkdir -p ccache
35-
(
36-
cd ccache
37-
ls -l
38-
md5sum *
39-
nc -v -l -p 5678 -q 1 < cache.tgz &
40-
nc -v -l -p 1234 -q 1 > new-cache.tgz &
41-
)
42-
fi
4333
4434
script: ./test-build.sh $NODE_VERSION $VARIANT
4535

@@ -126,16 +116,6 @@ jobs:
126116
- NODE_VERSION: "10"
127117
- VARIANT: "alpine"
128118

129-
before_cache:
130-
- ls -hl ccache/
131-
- ls -l ccache/
132-
- file ccache/*
133-
- md5sum ccache/*
134-
- mv ccache/new-cache.tgz ccache/cache.tgz
135-
cache:
136-
directories:
137-
- ccache/
138-
139119
- stage: Build
140120
before_script: *auto_skip
141121
env:
@@ -154,16 +134,6 @@ jobs:
154134
- NODE_VERSION: "11"
155135
- VARIANT: "alpine"
156136

157-
before_cache:
158-
- ls -hl ccache/
159-
- ls -l ccache/
160-
- file ccache/*
161-
- md5sum ccache/*
162-
- mv ccache/new-cache.tgz ccache/cache.tgz
163-
cache:
164-
directories:
165-
- ccache/
166-
167137
- stage: Build
168138
before_script: *auto_skip
169139
env:
@@ -188,16 +158,6 @@ jobs:
188158
- NODE_VERSION: "6"
189159
- VARIANT: "alpine"
190160

191-
before_cache:
192-
- ls -hl ccache/
193-
- ls -l ccache/
194-
- file ccache/*
195-
- md5sum ccache/*
196-
- mv ccache/new-cache.tgz ccache/cache.tgz
197-
cache:
198-
directories:
199-
- ccache/
200-
201161
- stage: Build
202162
before_script: *auto_skip
203163
env:
@@ -228,16 +188,6 @@ jobs:
228188
- NODE_VERSION: "8"
229189
- VARIANT: "alpine"
230190

231-
before_cache:
232-
- ls -hl ccache/
233-
- ls -l ccache/
234-
- file ccache/*
235-
- md5sum ccache/*
236-
- mv ccache/new-cache.tgz ccache/cache.tgz
237-
cache:
238-
directories:
239-
- ccache/
240-
241191
- stage: Build
242192
before_script: *auto_skip
243193
env:

‎10/alpine/Dockerfile‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ RUN addgroup -g 1000 node \
1111
curl \
1212
g++ \
1313
gcc \
14-
ccache \
15-
netcat-openbsd \
1614
gnupg \
1715
libgcc \
1816
linux-headers \
@@ -40,19 +38,10 @@ RUN addgroup -g 1000 node \
4038
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
4139
&& tar -xf "node-v$NODE_VERSION.tar.xz" \
4240
&& cd "node-v$NODE_VERSION" \
43-
&& ln -s /usr/bin/ccache /usr/local/bin/cc \
44-
&& ln -s /usr/bin/ccache /usr/local/bin/gcc \
45-
&& ln -s /usr/bin/ccache /usr/local/bin/g++ \
46-
&& HOST_IP="$(ip route | awk '/default/ { print $3 }')" \
47-
&& nc -v "$HOST_IP" 5678 | tar -xz -C / || true \
4841
&& ./configure \
4942
&& make -j$(getconf _NPROCESSORS_ONLN) \
5043
&& make install \
51-
&& rm -f /usr/local/bin/gcc /usr/local/bin/g++ \
52-
&& ccache -s 1>&2 \
5344
&& apk del .build-deps \
54-
&& tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \
55-
&& rm -rf /root/.ccache/ \
5645
&& cd .. \
5746
&& rm -Rf "node-v$NODE_VERSION" \
5847
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt

‎11/alpine/Dockerfile‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ RUN addgroup -g 1000 node \
1111
curl \
1212
g++ \
1313
gcc \
14-
ccache \
15-
netcat-openbsd \
1614
gnupg \
1715
libgcc \
1816
linux-headers \
@@ -40,19 +38,10 @@ RUN addgroup -g 1000 node \
4038
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
4139
&& tar -xf "node-v$NODE_VERSION.tar.xz" \
4240
&& cd "node-v$NODE_VERSION" \
43-
&& ln -s /usr/bin/ccache /usr/local/bin/cc \
44-
&& ln -s /usr/bin/ccache /usr/local/bin/gcc \
45-
&& ln -s /usr/bin/ccache /usr/local/bin/g++ \
46-
&& HOST_IP="$(ip route | awk '/default/ { print $3 }')" \
47-
&& nc -v "$HOST_IP" 5678 | tar -xz -C / || true \
4841
&& ./configure \
4942
&& make -j$(getconf _NPROCESSORS_ONLN) \
5043
&& make install \
51-
&& rm -f /usr/local/bin/gcc /usr/local/bin/g++ \
52-
&& ccache -s 1>&2 \
5344
&& apk del .build-deps \
54-
&& tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \
55-
&& rm -rf /root/.ccache/ \
5645
&& cd .. \
5746
&& rm -Rf "node-v$NODE_VERSION" \
5847
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt

‎6/alpine/Dockerfile‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ RUN addgroup -g 1000 node \
1111
curl \
1212
g++ \
1313
gcc \
14-
ccache \
15-
netcat-openbsd \
1614
gnupg \
1715
libgcc \
1816
linux-headers \
@@ -40,19 +38,10 @@ RUN addgroup -g 1000 node \
4038
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
4139
&& tar -xf "node-v$NODE_VERSION.tar.xz" \
4240
&& cd "node-v$NODE_VERSION" \
43-
&& ln -s /usr/bin/ccache /usr/local/bin/cc \
44-
&& ln -s /usr/bin/ccache /usr/local/bin/gcc \
45-
&& ln -s /usr/bin/ccache /usr/local/bin/g++ \
46-
&& HOST_IP="$(ip route | awk '/default/ { print $3 }')" \
47-
&& nc -v "$HOST_IP" 5678 | tar -xz -C / || true \
4841
&& ./configure \
4942
&& make -j$(getconf _NPROCESSORS_ONLN) \
5043
&& make install \
51-
&& rm -f /usr/local/bin/gcc /usr/local/bin/g++ \
52-
&& ccache -s 1>&2 \
5344
&& apk del .build-deps \
54-
&& tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \
55-
&& rm -rf /root/.ccache/ \
5645
&& cd .. \
5746
&& rm -Rf "node-v$NODE_VERSION" \
5847
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt

‎8/alpine/Dockerfile‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ RUN addgroup -g 1000 node \
1111
curl \
1212
g++ \
1313
gcc \
14-
ccache \
15-
netcat-openbsd \
1614
gnupg \
1715
libgcc \
1816
linux-headers \
@@ -40,19 +38,10 @@ RUN addgroup -g 1000 node \
4038
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
4139
&& tar -xf "node-v$NODE_VERSION.tar.xz" \
4240
&& cd "node-v$NODE_VERSION" \
43-
&& ln -s /usr/bin/ccache /usr/local/bin/cc \
44-
&& ln -s /usr/bin/ccache /usr/local/bin/gcc \
45-
&& ln -s /usr/bin/ccache /usr/local/bin/g++ \
46-
&& HOST_IP="$(ip route | awk '/default/ { print $3 }')" \
47-
&& nc -v "$HOST_IP" 5678 | tar -xz -C / || true \
4841
&& ./configure \
4942
&& make -j$(getconf _NPROCESSORS_ONLN) \
5043
&& make install \
51-
&& rm -f /usr/local/bin/gcc /usr/local/bin/g++ \
52-
&& ccache -s 1>&2 \
5344
&& apk del .build-deps \
54-
&& tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \
55-
&& rm -rf /root/.ccache/ \
5645
&& cd .. \
5746
&& rm -Rf "node-v$NODE_VERSION" \
5847
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt

‎Dockerfile-alpine.template‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ RUN addgroup -g 1000 node \
1111
curl \
1212
g++ \
1313
gcc \
14-
ccache \
15-
netcat-openbsd \
1614
gnupg \
1715
libgcc \
1816
linux-headers \
@@ -32,19 +30,10 @@ RUN addgroup -g 1000 node \
3230
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
3331
&& tar -xf "node-v$NODE_VERSION.tar.xz" \
3432
&& cd "node-v$NODE_VERSION" \
35-
&& ln -s /usr/bin/ccache /usr/local/bin/cc \
36-
&& ln -s /usr/bin/ccache /usr/local/bin/gcc \
37-
&& ln -s /usr/bin/ccache /usr/local/bin/g++ \
38-
&& HOST_IP="$(ip route | awk '/default/ { print $3 }')" \
39-
&& nc -v "$HOST_IP" 5678 | tar -xz -C / || true \
4033
&& ./configure \
4134
&& make -j$(getconf _NPROCESSORS_ONLN) \
4235
&& make install \
43-
&& rm -f /usr/local/bin/gcc /usr/local/bin/g++ \
44-
&& ccache -s 1>&2 \
4536
&& apk del .build-deps \
46-
&& tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \
47-
&& rm -rf /root/.ccache/ \
4837
&& cd .. \
4938
&& rm -Rf "node-v$NODE_VERSION" \
5039
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt

‎travis.yml.template‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,6 @@ services:
2828
echo "Skip build of $Dockerfile as it's not changed."
2929
exit
3030
fi
31-
if [ "alpine" = "$VARIANT" ]; then
32-
mkdir -p ccache
33-
(
34-
cd ccache
35-
ls -l
36-
md5sum *
37-
nc -v -l -p 5678 -q 1 < cache.tgz &
38-
nc -v -l -p 1234 -q 1 > new-cache.tgz &
39-
)
40-
fi
4131

4232
script: ./test-build.sh $NODE_VERSION $VARIANT
4333

‎update.sh‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -192,18 +192,6 @@ function add_stage() {
192192
env:
193193
- NODE_VERSION: "'"${version}"'"
194194
- VARIANT: "'"${variant}"'"' >> .travis.yml
195-
if [ "alpine" = "${variant}" ]; then
196-
echo '
197-
before_cache:
198-
- ls -hl ccache/
199-
- ls -l ccache/
200-
- file ccache/*
201-
- md5sum ccache/*
202-
- mv ccache/new-cache.tgz ccache/cache.tgz
203-
cache:
204-
directories:
205-
- ccache/' >> .travis.yml
206-
fi
207195
}
208196

209197
echo '# DO NOT MODIFY. THIS FILE IS AUTOGENERATED #

0 commit comments

Comments
 (0)