Skip to content

Commit 50f0521

Browse files
committed
remove assumptions from docker builds
1 parent f4b7eb3 commit 50f0521

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/build-aarch64-unknown-linux-gnu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
docker build -t ubuntu-builder -f Containerfile .
6969
- name: Build Rust
7070
run: |
71-
docker run -e RELEASE_DESCRIPTION='${{ github.event.inputs.release_version }}' --name rust-linux ubuntu-builder ./build.sh
71+
docker run -e RELEASE_BRANCH='${{ github.event.inputs.release_version }}' --name rust-linux ubuntu-builder ./build.sh
7272
mkdir -p build
7373
docker cp rust-linux:/home/rust/rust/build/dist build/dist
7474
- name: Upload Release Asset

.github/workflows/build-x86_64-unknown-linux-gnu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
docker build -f Containerfile -t ubuntu-builder .
5757
- name: Build Rust
5858
run: |
59-
docker run -e RELEASE_DESCRIPTION='${{ github.event.inputs.release_version }}' --name rust-linux ubuntu-builder ./build.sh
59+
docker run -e RELEASE_BRANCH='${{ github.event.inputs.release_version }}' --name rust-linux ubuntu-builder ./build.sh
6060
mkdir -p build
6161
docker cp rust-linux:/home/rust/rust/build/dist build/dist
6262
- name: Upload Release Asset

support/rust-build/aarch64-unknown-linux-gnu/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git
5+
git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git -b "${RELEASE_BRANCH}"
66
cd rust
7-
python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_DESCRIPTION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld
7+
python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_BRANCH}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld
88
python3 x.py dist --stage 2

support/rust-build/x86_64-unknown-linux-gnu/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git
5+
git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git -b "${RELEASE_BRANCH}"
66
cd rust
7-
python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_DESCRIPTION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld
7+
python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_BRANCH}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld
88
python3 x.py dist --stage 2

0 commit comments

Comments
 (0)