Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temporarily revert Alpine build ccache implement #932

Closed
wants to merge 1 commit into from
Closed

Temporarily revert Alpine build ccache implement #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 0 additions & 50 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,6 @@ services:
echo "Skip build of $Dockerfile as it's not changed."
exit
fi
if [ "alpine" = "$VARIANT" ]; then
mkdir -p ccache
(
cd ccache
ls -l
md5sum *
nc -v -l -p 5678 -q 1 < cache.tgz &
nc -v -l -p 1234 -q 1 > new-cache.tgz &
)
fi

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

Expand Down Expand Up @@ -126,16 +116,6 @@ jobs:
- NODE_VERSION: "10"
- VARIANT: "alpine"

before_cache:
- ls -hl ccache/
- ls -l ccache/
- file ccache/*
- md5sum ccache/*
- mv ccache/new-cache.tgz ccache/cache.tgz
cache:
directories:
- ccache/

- stage: Build
before_script: *auto_skip
env:
Expand All @@ -154,16 +134,6 @@ jobs:
- NODE_VERSION: "11"
- VARIANT: "alpine"

before_cache:
- ls -hl ccache/
- ls -l ccache/
- file ccache/*
- md5sum ccache/*
- mv ccache/new-cache.tgz ccache/cache.tgz
cache:
directories:
- ccache/

- stage: Build
before_script: *auto_skip
env:
Expand All @@ -188,16 +158,6 @@ jobs:
- NODE_VERSION: "6"
- VARIANT: "alpine"

before_cache:
- ls -hl ccache/
- ls -l ccache/
- file ccache/*
- md5sum ccache/*
- mv ccache/new-cache.tgz ccache/cache.tgz
cache:
directories:
- ccache/

- stage: Build
before_script: *auto_skip
env:
Expand Down Expand Up @@ -228,16 +188,6 @@ jobs:
- NODE_VERSION: "8"
- VARIANT: "alpine"

before_cache:
- ls -hl ccache/
- ls -l ccache/
- file ccache/*
- md5sum ccache/*
- mv ccache/new-cache.tgz ccache/cache.tgz
cache:
directories:
- ccache/

- stage: Build
before_script: *auto_skip
env:
Expand Down
7 changes: 0 additions & 7 deletions 10/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ RUN addgroup -g 1000 node \
curl \
g++ \
gcc \
ccache \
netcat-openbsd \
gnupg \
libgcc \
Expand Down Expand Up @@ -40,19 +39,13 @@ RUN addgroup -g 1000 node \
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xf "node-v$NODE_VERSION.tar.xz" \
&& cd "node-v$NODE_VERSION" \
&& ln -s /usr/bin/ccache /usr/local/bin/cc \
&& ln -s /usr/bin/ccache /usr/local/bin/gcc \
&& ln -s /usr/bin/ccache /usr/local/bin/g++ \
&& HOST_IP="$(ip route | awk '/default/ { print $3 }')" \
&& nc -v "$HOST_IP" 5678 | tar -xz -C / || true \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are the most problematic bits (nc to the host machine IP is really hacky), so I'd recommend including them in this revert.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Used git revert to create a more direct "revert" alternative at #933 to try and help this get in for the security release next week. 👍

&& ./configure \
&& make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \
&& rm -f /usr/local/bin/gcc /usr/local/bin/g++ \
&& ccache -s 1>&2 \
&& apk del .build-deps \
&& tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \
&& rm -rf /root/.ccache/ \
&& cd .. \
&& rm -Rf "node-v$NODE_VERSION" \
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt
Expand Down
7 changes: 0 additions & 7 deletions 11/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ RUN addgroup -g 1000 node \
curl \
g++ \
gcc \
ccache \
netcat-openbsd \
gnupg \
libgcc \
Expand Down Expand Up @@ -40,19 +39,13 @@ RUN addgroup -g 1000 node \
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xf "node-v$NODE_VERSION.tar.xz" \
&& cd "node-v$NODE_VERSION" \
&& ln -s /usr/bin/ccache /usr/local/bin/cc \
&& ln -s /usr/bin/ccache /usr/local/bin/gcc \
&& ln -s /usr/bin/ccache /usr/local/bin/g++ \
&& HOST_IP="$(ip route | awk '/default/ { print $3 }')" \
&& nc -v "$HOST_IP" 5678 | tar -xz -C / || true \
&& ./configure \
&& make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \
&& rm -f /usr/local/bin/gcc /usr/local/bin/g++ \
&& ccache -s 1>&2 \
&& apk del .build-deps \
&& tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \
&& rm -rf /root/.ccache/ \
&& cd .. \
&& rm -Rf "node-v$NODE_VERSION" \
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt
Expand Down
7 changes: 0 additions & 7 deletions 6/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ RUN addgroup -g 1000 node \
curl \
g++ \
gcc \
ccache \
netcat-openbsd \
gnupg \
libgcc \
Expand Down Expand Up @@ -40,19 +39,13 @@ RUN addgroup -g 1000 node \
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xf "node-v$NODE_VERSION.tar.xz" \
&& cd "node-v$NODE_VERSION" \
&& ln -s /usr/bin/ccache /usr/local/bin/cc \
&& ln -s /usr/bin/ccache /usr/local/bin/gcc \
&& ln -s /usr/bin/ccache /usr/local/bin/g++ \
&& HOST_IP="$(ip route | awk '/default/ { print $3 }')" \
&& nc -v "$HOST_IP" 5678 | tar -xz -C / || true \
&& ./configure \
&& make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \
&& rm -f /usr/local/bin/gcc /usr/local/bin/g++ \
&& ccache -s 1>&2 \
&& apk del .build-deps \
&& tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \
&& rm -rf /root/.ccache/ \
&& cd .. \
&& rm -Rf "node-v$NODE_VERSION" \
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt
Expand Down
7 changes: 0 additions & 7 deletions 8/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ RUN addgroup -g 1000 node \
curl \
g++ \
gcc \
ccache \
netcat-openbsd \
gnupg \
libgcc \
Expand Down Expand Up @@ -40,19 +39,13 @@ RUN addgroup -g 1000 node \
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xf "node-v$NODE_VERSION.tar.xz" \
&& cd "node-v$NODE_VERSION" \
&& ln -s /usr/bin/ccache /usr/local/bin/cc \
&& ln -s /usr/bin/ccache /usr/local/bin/gcc \
&& ln -s /usr/bin/ccache /usr/local/bin/g++ \
&& HOST_IP="$(ip route | awk '/default/ { print $3 }')" \
&& nc -v "$HOST_IP" 5678 | tar -xz -C / || true \
&& ./configure \
&& make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \
&& rm -f /usr/local/bin/gcc /usr/local/bin/g++ \
&& ccache -s 1>&2 \
&& apk del .build-deps \
&& tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \
&& rm -rf /root/.ccache/ \
&& cd .. \
&& rm -Rf "node-v$NODE_VERSION" \
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt
Expand Down
7 changes: 0 additions & 7 deletions Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ RUN addgroup -g 1000 node \
curl \
g++ \
gcc \
ccache \
netcat-openbsd \
gnupg \
libgcc \
Expand All @@ -32,19 +31,13 @@ RUN addgroup -g 1000 node \
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xf "node-v$NODE_VERSION.tar.xz" \
&& cd "node-v$NODE_VERSION" \
&& ln -s /usr/bin/ccache /usr/local/bin/cc \
&& ln -s /usr/bin/ccache /usr/local/bin/gcc \
&& ln -s /usr/bin/ccache /usr/local/bin/g++ \
&& HOST_IP="$(ip route | awk '/default/ { print $3 }')" \
&& nc -v "$HOST_IP" 5678 | tar -xz -C / || true \
&& ./configure \
&& make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \
&& rm -f /usr/local/bin/gcc /usr/local/bin/g++ \
&& ccache -s 1>&2 \
&& apk del .build-deps \
&& tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \
&& rm -rf /root/.ccache/ \
&& cd .. \
&& rm -Rf "node-v$NODE_VERSION" \
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt
Expand Down
10 changes: 0 additions & 10 deletions travis.yml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,6 @@ services:
echo "Skip build of $Dockerfile as it's not changed."
exit
fi
if [ "alpine" = "$VARIANT" ]; then
mkdir -p ccache
(
cd ccache
ls -l
md5sum *
nc -v -l -p 5678 -q 1 < cache.tgz &
nc -v -l -p 1234 -q 1 > new-cache.tgz &
)
fi

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

Expand Down
12 changes: 0 additions & 12 deletions update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,18 +192,6 @@ function add_stage() {
env:
- NODE_VERSION: "'"${version}"'"
- VARIANT: "'"${variant}"'"' >> .travis.yml
if [ "alpine" = "${variant}" ]; then
echo '
before_cache:
- ls -hl ccache/
- ls -l ccache/
- file ccache/*
- md5sum ccache/*
- mv ccache/new-cache.tgz ccache/cache.tgz
cache:
directories:
- ccache/' >> .travis.yml
fi
}

echo '# DO NOT MODIFY. THIS FILE IS AUTOGENERATED #
Expand Down