From 1d50b580f3cd094caba9fede6eeea64abf5c3730 Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Mon, 17 Nov 2025 11:41:20 +0000 Subject: [PATCH 01/11] use macos runner for x86 gnu linux builds --- .github/workflows/build-x86_64-unknown-linux-gnu.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-x86_64-unknown-linux-gnu.yaml b/.github/workflows/build-x86_64-unknown-linux-gnu.yaml index fcd7996..e9a5509 100644 --- a/.github/workflows/build-x86_64-unknown-linux-gnu.yaml +++ b/.github/workflows/build-x86_64-unknown-linux-gnu.yaml @@ -38,9 +38,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [linux-x86_64-self-hosted] + os: [macos-m1-self-hosted] include: - - os: linux-x86_64-self-hosted + - os: macos-m1-self-hosted ASSET_PATH: "build/dist/rust-nightly-x86_64-unknown-linux-gnu.tar.xz" ASSET_NAME: "rust-${{ github.event.inputs.release_version }}-x86_64-unknown-linux-gnu.tar.xz" ASSET_CONTENT_TYPE: "application/x-tar" From 16d89a1b2bb84b364a01a0c2ead57ed58469961d Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Mon, 17 Nov 2025 11:41:46 +0000 Subject: [PATCH 02/11] build/1.91.1.0 --- .github/workflows/build-aarch64-apple-darwin.yaml | 6 +++--- .github/workflows/build-aarch64-unknown-linux-gnu.yaml | 6 +++--- .github/workflows/build-rust-src.yaml | 6 +++--- .github/workflows/build-x86_64-pc-windows-msvc.yaml | 6 +++--- .github/workflows/build-x86_64-unknown-linux-gnu.yaml | 6 +++--- .github/workflows/prepare-release.yaml | 2 +- .github/workflows/publish-idf-rust-tags.yml | 2 +- support/rust-build/Repackage-RustRelease.ps1 | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-aarch64-apple-darwin.yaml b/.github/workflows/build-aarch64-apple-darwin.yaml index 731bd10..945a348 100644 --- a/.github/workflows/build-aarch64-apple-darwin.yaml +++ b/.github/workflows/build-aarch64-apple-darwin.yaml @@ -6,11 +6,11 @@ on: release_version: description: "Xtensa Rust release version to build" required: true - default: '1.90.0.0' + default: '1.91.1.0' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.90.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.91.1.0, untagged-00000)" required: true - default: "v1.90.0.0" + default: "v1.91.1.0" jobs: get_release: diff --git a/.github/workflows/build-aarch64-unknown-linux-gnu.yaml b/.github/workflows/build-aarch64-unknown-linux-gnu.yaml index a171bdd..13eb5ed 100644 --- a/.github/workflows/build-aarch64-unknown-linux-gnu.yaml +++ b/.github/workflows/build-aarch64-unknown-linux-gnu.yaml @@ -6,11 +6,11 @@ on: release_version: description: "Xtensa Rust release version to build" required: true - default: '1.90.0.0' + default: '1.91.1.0' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.90.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.91.1.0, untagged-00000)" required: true - default: "v1.90.0.0" + default: "v1.91.1.0" jobs: get_release: diff --git a/.github/workflows/build-rust-src.yaml b/.github/workflows/build-rust-src.yaml index bf199b7..2dfe73e 100644 --- a/.github/workflows/build-rust-src.yaml +++ b/.github/workflows/build-rust-src.yaml @@ -6,11 +6,11 @@ on: release_version: description: "Xtensa Rust release version to build" required: true - default: '1.90.0.0' + default: '1.91.1.0' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.90.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.91.1.0, untagged-00000)" required: true - default: "v1.90.0.0" + default: "v1.91.1.0" jobs: get_release: diff --git a/.github/workflows/build-x86_64-pc-windows-msvc.yaml b/.github/workflows/build-x86_64-pc-windows-msvc.yaml index 7f56d86..d88d3d7 100644 --- a/.github/workflows/build-x86_64-pc-windows-msvc.yaml +++ b/.github/workflows/build-x86_64-pc-windows-msvc.yaml @@ -6,11 +6,11 @@ on: release_version: description: "Xtensa Rust release version to build" required: true - default: '1.90.0.0' + default: '1.91.1.0' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.90.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.91.1.0, untagged-00000)" required: true - default: "v1.90.0.0" + default: "v1.91.1.0" jobs: get_release: diff --git a/.github/workflows/build-x86_64-unknown-linux-gnu.yaml b/.github/workflows/build-x86_64-unknown-linux-gnu.yaml index e9a5509..7f81a1c 100644 --- a/.github/workflows/build-x86_64-unknown-linux-gnu.yaml +++ b/.github/workflows/build-x86_64-unknown-linux-gnu.yaml @@ -5,11 +5,11 @@ on: release_version: description: "Xtensa Rust release version to build" required: true - default: "1.90.0.0" + default: "1.91.1.0" release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.90.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.91.1.0, untagged-00000)" required: true - default: "v1.90.0.0" + default: "v1.91.1.0" jobs: get_release: diff --git a/.github/workflows/prepare-release.yaml b/.github/workflows/prepare-release.yaml index c4fd3cf..f4cb2aa 100644 --- a/.github/workflows/prepare-release.yaml +++ b/.github/workflows/prepare-release.yaml @@ -6,7 +6,7 @@ on: next_release: description: "Next Xtensa Rust release version" required: true - default: "v1.90.0.0" + default: "v1.91.1.0" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/publish-idf-rust-tags.yml b/.github/workflows/publish-idf-rust-tags.yml index a6bbc76..b71cde0 100644 --- a/.github/workflows/publish-idf-rust-tags.yml +++ b/.github/workflows/publish-idf-rust-tags.yml @@ -6,7 +6,7 @@ on: toolchain-version: description: "Version of Rust toolchain" required: true - default: "1.90.0.0" + default: "1.91.1.0" publish: description: "Publish the tags to Dockehub?" required: true diff --git a/support/rust-build/Repackage-RustRelease.ps1 b/support/rust-build/Repackage-RustRelease.ps1 index 062adbb..aa62ad2 100644 --- a/support/rust-build/Repackage-RustRelease.ps1 +++ b/support/rust-build/Repackage-RustRelease.ps1 @@ -11,7 +11,7 @@ param ( $ErrorActionPreference = "Stop" $RustVersion="nightly" -$ReleaseVersion="1.90.0.0" +$ReleaseVersion="1.91.1.0" if (Test-Path -Path esp -PathType Container) { Remove-Item -Recurse -Force -Path esp From d25a6fd6e12cc793390cf9d9879bc441f0e273d4 Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Mon, 17 Nov 2025 12:41:34 +0000 Subject: [PATCH 03/11] ensure docker is running before starting --- .../workflows/build-x86_64-unknown-linux-gnu.yaml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-x86_64-unknown-linux-gnu.yaml b/.github/workflows/build-x86_64-unknown-linux-gnu.yaml index 7f81a1c..82b9b9d 100644 --- a/.github/workflows/build-x86_64-unknown-linux-gnu.yaml +++ b/.github/workflows/build-x86_64-unknown-linux-gnu.yaml @@ -45,8 +45,19 @@ jobs: ASSET_NAME: "rust-${{ github.event.inputs.release_version }}-x86_64-unknown-linux-gnu.tar.xz" ASSET_CONTENT_TYPE: "application/x-tar" steps: - - name: Initialize Docker + - name: Initialize docker run: | + if ! launchctl list | grep -q com.docker.docker; then + echo "Starting Docker..." + open --background -a Docker + # Wait for Docker to start + while ! docker system info > /dev/null 2>&1; do + echo "Waiting for Docker to start..." + sleep 10 + done + else + echo "Docker is already running." + fi docker container rm rust-linux || echo "Container name rust-linux is available" - name: Checkout repository uses: actions/checkout@v5 From 86694cc9c2cb3ee0e83db9841fc37cd7e5263fb4 Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Mon, 17 Nov 2025 14:19:23 +0000 Subject: [PATCH 04/11] ensure correct compiler target is being used --- .github/workflows/build-x86_64-unknown-linux-gnu.yaml | 2 +- support/rust-build/aarch64-unknown-linux-gnu/build.sh | 2 +- support/rust-build/x86_64-unknown-linux-gnu/build.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-x86_64-unknown-linux-gnu.yaml b/.github/workflows/build-x86_64-unknown-linux-gnu.yaml index 82b9b9d..00f93a4 100644 --- a/.github/workflows/build-x86_64-unknown-linux-gnu.yaml +++ b/.github/workflows/build-x86_64-unknown-linux-gnu.yaml @@ -64,7 +64,7 @@ jobs: - name: Build construction container run: | cd support/rust-build/x86_64-unknown-linux-gnu - docker build -f Containerfile -t ubuntu-builder . + docker build -t ubuntu-builder -f Containerfile . - name: Build Rust run: | docker run -e RELEASE_VERSION='${{ github.event.inputs.release_version }}' --name rust-linux ubuntu-builder ./build.sh diff --git a/support/rust-build/aarch64-unknown-linux-gnu/build.sh b/support/rust-build/aarch64-unknown-linux-gnu/build.sh index 42b4fe6..36992a0 100755 --- a/support/rust-build/aarch64-unknown-linux-gnu/build.sh +++ b/support/rust-build/aarch64-unknown-linux-gnu/build.sh @@ -4,5 +4,5 @@ set -e git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git -b "esp-${RELEASE_VERSION}" cd rust -python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld +python3 src/bootstrap/configure.py --target aarch64-unknown-linux-gnu --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld python3 x.py dist --stage 2 diff --git a/support/rust-build/x86_64-unknown-linux-gnu/build.sh b/support/rust-build/x86_64-unknown-linux-gnu/build.sh index cfb5221..c927565 100755 --- a/support/rust-build/x86_64-unknown-linux-gnu/build.sh +++ b/support/rust-build/x86_64-unknown-linux-gnu/build.sh @@ -4,5 +4,5 @@ set -e git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git -b "esp-${RELEASE_VERSION}" cd rust -python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld +python3 src/bootstrap/configure.py --target x86_64-unknown-linux-gnu --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld python3 x.py dist --stage 2 \ No newline at end of file From c71766b01df0766f29cbebf401a2aad75c4bfc33 Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Mon, 17 Nov 2025 14:29:07 +0000 Subject: [PATCH 05/11] install x86 tools and configure x86 gnu build --- support/rust-build/aarch64-unknown-linux-gnu/build.sh | 3 ++- support/rust-build/x86_64-unknown-linux-gnu/Containerfile | 4 +++- support/rust-build/x86_64-unknown-linux-gnu/build.sh | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/support/rust-build/aarch64-unknown-linux-gnu/build.sh b/support/rust-build/aarch64-unknown-linux-gnu/build.sh index 36992a0..7d881a6 100755 --- a/support/rust-build/aarch64-unknown-linux-gnu/build.sh +++ b/support/rust-build/aarch64-unknown-linux-gnu/build.sh @@ -4,5 +4,6 @@ set -e git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git -b "esp-${RELEASE_VERSION}" cd rust -python3 src/bootstrap/configure.py --target aarch64-unknown-linux-gnu --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld +python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld + python3 x.py dist --stage 2 diff --git a/support/rust-build/x86_64-unknown-linux-gnu/Containerfile b/support/rust-build/x86_64-unknown-linux-gnu/Containerfile index 3e27b97..b561ee7 100644 --- a/support/rust-build/x86_64-unknown-linux-gnu/Containerfile +++ b/support/rust-build/x86_64-unknown-linux-gnu/Containerfile @@ -5,7 +5,9 @@ ENV LC_ALL=C.UTF-8 ENV LANG=C.UTF-8 RUN apt-get update \ && apt-get install -y vim nano git curl gcc ninja-build cmake libudev-dev python3 python3-pip libusb-1.0-0 libssl-dev \ - pkg-config libtinfo5 + pkg-config libtinfo5 \ + gcc-x86-64-linux-gnu \ + g++-x86-64-linux-gnu RUN adduser --disabled-password --gecos "" rust USER rust diff --git a/support/rust-build/x86_64-unknown-linux-gnu/build.sh b/support/rust-build/x86_64-unknown-linux-gnu/build.sh index c927565..6cf1d18 100755 --- a/support/rust-build/x86_64-unknown-linux-gnu/build.sh +++ b/support/rust-build/x86_64-unknown-linux-gnu/build.sh @@ -4,5 +4,6 @@ set -e git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git -b "esp-${RELEASE_VERSION}" cd rust -python3 src/bootstrap/configure.py --target x86_64-unknown-linux-gnu --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld -python3 x.py dist --stage 2 \ No newline at end of file +python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld --host aarch64-unknown-linux-gnu,x86_64-unknown-linux-gnu --target aarch64-unknown-linux-gnu,x86_64-unknown-linux-gnu --build aarch64-unknown-linux-gnu + +python3 x.py dist --stage 2 From 091821f02dcafbe33c415b90478fe8f2915bf852 Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Wed, 19 Nov 2025 14:38:26 +0000 Subject: [PATCH 06/11] install glibc and stdc++ for amd64 too --- .../x86_64-unknown-linux-gnu/Containerfile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/support/rust-build/x86_64-unknown-linux-gnu/Containerfile b/support/rust-build/x86_64-unknown-linux-gnu/Containerfile index b561ee7..dd27cf9 100644 --- a/support/rust-build/x86_64-unknown-linux-gnu/Containerfile +++ b/support/rust-build/x86_64-unknown-linux-gnu/Containerfile @@ -3,8 +3,23 @@ FROM ubuntu:22.04 ENV DEBIAN_FRONTEND=noninteractive ENV LC_ALL=C.UTF-8 ENV LANG=C.UTF-8 -RUN apt-get update \ - && apt-get install -y vim nano git curl gcc ninja-build cmake libudev-dev python3 python3-pip libusb-1.0-0 libssl-dev \ + +# The following block of commands are order sensitive! +# update _must_ come before adding declaring to dpkg we want amd64 packages else it fails +# we update before and after adding the arch to ensure we have the latest package lists +# this block ensures x86 dependencies are there for rosetta to use during various build steps +RUN apt-get update +RUN echo '\ +deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse\n\ +deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse\n\ +deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse\n\ +deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse\n\ +' >> /etc/apt/sources.list +RUN apt-get update +RUN dpkg --add-architecture amd64 +RUN apt-get install libc6:amd64 libstdc++6:amd64 -y + +RUN apt-get install -y vim nano git curl gcc ninja-build cmake libudev-dev python3 python3-pip libusb-1.0-0 libssl-dev \ pkg-config libtinfo5 \ gcc-x86-64-linux-gnu \ g++-x86-64-linux-gnu From 4bfc0e0c5b521b88fb510be939172d96d1202884 Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Thu, 20 Nov 2025 12:16:34 +0000 Subject: [PATCH 07/11] don't build docs, they're not used anways --- support/rust-build/x86_64-unknown-linux-gnu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/rust-build/x86_64-unknown-linux-gnu/build.sh b/support/rust-build/x86_64-unknown-linux-gnu/build.sh index 6cf1d18..3a92cd8 100755 --- a/support/rust-build/x86_64-unknown-linux-gnu/build.sh +++ b/support/rust-build/x86_64-unknown-linux-gnu/build.sh @@ -4,6 +4,6 @@ set -e git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git -b "esp-${RELEASE_VERSION}" cd rust -python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld --host aarch64-unknown-linux-gnu,x86_64-unknown-linux-gnu --target aarch64-unknown-linux-gnu,x86_64-unknown-linux-gnu --build aarch64-unknown-linux-gnu +python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld --host aarch64-unknown-linux-gnu,x86_64-unknown-linux-gnu --target aarch64-unknown-linux-gnu,x86_64-unknown-linux-gnu --build aarch64-unknown-linux-gnu --disable-docs python3 x.py dist --stage 2 From 9e68a387885b205fa5f714f9f730692f781ede79 Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Thu, 20 Nov 2025 14:36:38 +0000 Subject: [PATCH 08/11] build rustdoc, don't do two compiler builds --- support/rust-build/x86_64-unknown-linux-gnu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/rust-build/x86_64-unknown-linux-gnu/build.sh b/support/rust-build/x86_64-unknown-linux-gnu/build.sh index 3a92cd8..b86ab79 100755 --- a/support/rust-build/x86_64-unknown-linux-gnu/build.sh +++ b/support/rust-build/x86_64-unknown-linux-gnu/build.sh @@ -4,6 +4,6 @@ set -e git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git -b "esp-${RELEASE_VERSION}" cd rust -python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld --host aarch64-unknown-linux-gnu,x86_64-unknown-linux-gnu --target aarch64-unknown-linux-gnu,x86_64-unknown-linux-gnu --build aarch64-unknown-linux-gnu --disable-docs +python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src,rustdoc --dist-compression-formats='xz' --enable-lld --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu --build aarch64-unknown-linux-gnu python3 x.py dist --stage 2 From 8f10200ad652546f7c0022177ed4e2c4126f7a07 Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Tue, 25 Nov 2025 15:00:59 +0000 Subject: [PATCH 09/11] build then dist --- support/rust-build/x86_64-unknown-linux-gnu/build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/support/rust-build/x86_64-unknown-linux-gnu/build.sh b/support/rust-build/x86_64-unknown-linux-gnu/build.sh index b86ab79..8fed6f4 100755 --- a/support/rust-build/x86_64-unknown-linux-gnu/build.sh +++ b/support/rust-build/x86_64-unknown-linux-gnu/build.sh @@ -4,6 +4,7 @@ set -e git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git -b "esp-${RELEASE_VERSION}" cd rust -python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src,rustdoc --dist-compression-formats='xz' --enable-lld --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu --build aarch64-unknown-linux-gnu +python3 src/bootstrap/configure.py configure --experimental-targets=Xtensa --release-channel=nightly --enable-extended --tools=rustdoc,clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --enable-lld --prefix $(pwd)/build/esp --sysconfdir $(pwd)/build/esp-etc --disable-docs -python3 x.py dist --stage 2 +python3 x.py build +python3 x.py dist From 21882a8962f12eb2a3148f6ba293cfb282b3d7f6 Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Tue, 25 Nov 2025 15:05:42 +0000 Subject: [PATCH 10/11] build then dist --- support/rust-build/x86_64-unknown-linux-gnu/build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/support/rust-build/x86_64-unknown-linux-gnu/build.sh b/support/rust-build/x86_64-unknown-linux-gnu/build.sh index 8fed6f4..497cc41 100755 --- a/support/rust-build/x86_64-unknown-linux-gnu/build.sh +++ b/support/rust-build/x86_64-unknown-linux-gnu/build.sh @@ -4,7 +4,6 @@ set -e git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git -b "esp-${RELEASE_VERSION}" cd rust -python3 src/bootstrap/configure.py configure --experimental-targets=Xtensa --release-channel=nightly --enable-extended --tools=rustdoc,clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --enable-lld --prefix $(pwd)/build/esp --sysconfdir $(pwd)/build/esp-etc --disable-docs +python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --enable-extended --tools=rustdoc,clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --enable-lld --prefix $(pwd)/build/esp --sysconfdir $(pwd)/build/esp-etc --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu --build aarch64-unknown-linux-gnu --disable-docs -python3 x.py build python3 x.py dist From 6d72730b118ad7be738df3e02e032bc39250854d Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Fri, 28 Nov 2025 18:20:05 +0000 Subject: [PATCH 11/11] just use --host, let bootstrap infer the rest. Add aarch64 first to ensure docs use the right host toolchain --- support/rust-build/x86_64-unknown-linux-gnu/build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/support/rust-build/x86_64-unknown-linux-gnu/build.sh b/support/rust-build/x86_64-unknown-linux-gnu/build.sh index 497cc41..a4ccd5d 100755 --- a/support/rust-build/x86_64-unknown-linux-gnu/build.sh +++ b/support/rust-build/x86_64-unknown-linux-gnu/build.sh @@ -4,6 +4,5 @@ set -e git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git -b "esp-${RELEASE_VERSION}" cd rust -python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --enable-extended --tools=rustdoc,clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --enable-lld --prefix $(pwd)/build/esp --sysconfdir $(pwd)/build/esp-etc --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu --build aarch64-unknown-linux-gnu --disable-docs - +python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src,rustdoc --dist-compression-formats='xz' --enable-lld --host aarch64-unknown-linux-gnu,x86_64-unknown-linux-gnu --disable-docs python3 x.py dist