Skip to content

Commit fa7e2c8

Browse files
authored
Merge pull request #152 from emqx/0129_install_rust_for_all_otp_vsn
fix: Install rust for all otp version builder
2 parents 2b5a34a + 4f595ad commit fa7e2c8

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

.github/workflows/test.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,7 @@ jobs:
127127
LUX_VERSION=${{ startsWith(matrix.otp, '24') && 'lux-2.6' || '' }}
128128
file: ./Dockerfile
129129
context: .
130-
- name: Test OTP 27 Image (Rust Toolchain should be installed)
131-
if: startsWith(matrix.otp, '27')
130+
- name: All OTP Image (Rust Toolchain should be installed)
132131
run: |
133132
docker run --rm test-image:latest bash -c 'rustup toolchain list' | \
134133
grep "1.88.0"
135-
- name: Test non-OTP 27 Image (Rust Toolchain should NOT be installed)
136-
if: "!startsWith(matrix.otp, '27')"
137-
run: |
138-
docker run --rm test-image:latest bash -c 'rustup toolchain list' | \
139-
grep "no installed toolchains"

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN if [ -f /opt/rh/devtoolset-10/enable ]; then source /opt/rh/devtoolset-10/en
2222
/get-otp.sh ${OTP_VERSION} && \
2323
/get-elixir.sh ${ELIXIR_VERSION} && \
2424
if [ "${OTP_VERSION#26.}" != "$OTP_VERSION" ]; then /get-fdb.sh ${FDB_VERSION}; fi && \
25-
if echo "${OTP_VERSION}" | grep -q "^27\."; then /get-rust.sh ${RUST_VERSION}; fi && \
25+
/get-rust.sh ${RUST_VERSION} && \
2626
/get-emqtt-bench.sh && \
2727
/get-lux.sh ${LUX_VERSION} && \
2828
rm /get-otp.sh /get-zsh.sh /get-elixir.sh /get-fdb.sh /get-emqtt-bench.sh /get-lux.sh

0 commit comments

Comments
 (0)