File tree 2 files changed +10
-5
lines changed
2 files changed +10
-5
lines changed Original file line number Diff line number Diff line change 12
12
- run :
13
13
name : Build and push Docker image
14
14
command : |
15
- docker build -t opengg/rust-wasm:latest .
15
+ DOCKER_TAG="${CIRCLE_BRANCH}"
16
+ if [ "${CIRCLE_BRANCH}" == "master" ]; then
17
+ DOCKER_TAG="latest"
18
+ fi
19
+ docker build -t opengg/rust-wasm:local .
16
20
echo "$DOCKER_PASSWORD_BASE64"|base64 -d|docker login -u "$DOCKER_USER" --password-stdin
17
- docker tag opengg/rust-wasm:latest "opengg/rust-wasm:1.0.$CIRCLE_BUILD_NUM"
18
- docker push opengg/rust-wasm:latest
21
+ docker tag opengg/rust-wasm:local "opengg/rust-wasm:$DOCKER_TAG"
22
+ docker tag opengg/rust-wasm:local "opengg/rust-wasm:1.0.$CIRCLE_BUILD_NUM"
23
+ docker push "opengg/rust-wasm:$DOCKER_TAG"
19
24
docker push "opengg/rust-wasm:1.0.$CIRCLE_BUILD_NUM"
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ RUN cd / \
22
22
&& cd llvm \
23
23
&& mkdir working \
24
24
&& cd working \
25
- && cmake -DCMAKE_INSTALL_PREFIX=/rust-wasm-bin/llvm -DCMAKE_BUILD_TYPE=Release -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly .. \
25
+ && cmake -DLLVM_DEFAULT_TARGET_TRIPLE=wasm32-unknown-unknown - DCMAKE_INSTALL_PREFIX=/rust-wasm-bin/llvm -DCMAKE_BUILD_TYPE=Release -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly .. \
26
26
&& make -j8 \
27
27
&& make install \
28
28
# binaryen
@@ -35,7 +35,7 @@ RUN cd / \
35
35
&& make -j8 \
36
36
&& make install \
37
37
# rustup
38
- && curl https://sh.rustup.rs -sSf | sh -s -- -y \
38
+ && curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly \
39
39
# clean
40
40
&& apt-get purge -y --auto-remove git build-essential cmake curl g++ python \
41
41
&& apt-get autoclean -y \
You can’t perform that action at this time.
0 commit comments