File tree Expand file tree Collapse file tree 2 files changed +10
-5
lines changed Expand file tree Collapse file tree 2 files changed +10
-5
lines changed Original file line number Diff line number Diff line change 1212 - run :
1313 name : Build and push Docker image
1414 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 .
1620 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"
1924 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 / \
2222 && cd llvm \
2323 && mkdir working \
2424 && 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 .. \
2626 && make -j8 \
2727 && make install \
2828 # binaryen
@@ -35,7 +35,7 @@ RUN cd / \
3535 && make -j8 \
3636 && make install \
3737 # rustup
38- && curl https://sh.rustup.rs -sSf | sh -s -- -y \
38+ && curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly \
3939 # clean
4040 && apt-get purge -y --auto-remove git build-essential cmake curl g++ python \
4141 && apt-get autoclean -y \
You can’t perform that action at this time.
0 commit comments