From 290112208f53eadc73dc3e2ee3b094a6ea16f844 Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Mon, 21 Oct 2024 15:29:15 +0100 Subject: [PATCH 1/4] build/1.81.0.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-apple-darwin.yaml | 6 +++--- .github/workflows/build-x86_64-pc-windows-gnu.yaml | 6 +++--- .github/workflows/build-x86_64-pc-windows-msvc.yaml | 6 +++--- .github/workflows/build-x86_64-unknown-linux-gnu.yaml | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-aarch64-apple-darwin.yaml b/.github/workflows/build-aarch64-apple-darwin.yaml index 323d3c0..fe463bd 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.81.0.0' + default: '1.82.0.0' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.81.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.82.0.0, untagged-00000)" required: true - default: "v1.81.0.0" + default: "v1.82.0.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 dbfdc1f..d611458 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.81.0.0' + default: '1.82.0.0' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.81.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.82.0.0, untagged-00000)" required: true - default: "v1.81.0.0" + default: "v1.82.0.0" jobs: get_release: diff --git a/.github/workflows/build-rust-src.yaml b/.github/workflows/build-rust-src.yaml index 5d5e57d..5250980 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.81.0.0' + default: '1.82.0.0' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.81.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.82.0.0, untagged-00000)" required: true - default: "v1.81.0.0" + default: "v1.82.0.0" jobs: get_release: diff --git a/.github/workflows/build-x86_64-apple-darwin.yaml b/.github/workflows/build-x86_64-apple-darwin.yaml index 61c7a3d..73c4d7c 100644 --- a/.github/workflows/build-x86_64-apple-darwin.yaml +++ b/.github/workflows/build-x86_64-apple-darwin.yaml @@ -5,11 +5,11 @@ on: release_version: description: "Xtensa Rust release version to build" required: true - default: '1.81.0.0' + default: '1.82.0.0' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.81.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.82.0.0, untagged-00000)" required: true - default: "v1.81.0.0" + default: "v1.82.0.0" jobs: get_release: diff --git a/.github/workflows/build-x86_64-pc-windows-gnu.yaml b/.github/workflows/build-x86_64-pc-windows-gnu.yaml index 8428030..9c3bf83 100644 --- a/.github/workflows/build-x86_64-pc-windows-gnu.yaml +++ b/.github/workflows/build-x86_64-pc-windows-gnu.yaml @@ -6,11 +6,11 @@ on: release_version: description: "Xtensa Rust release version to build" required: true - default: '1.81.0.0' + default: '1.82.0.0' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.81.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.82.0.0, untagged-00000)" required: true - default: "v1.81.0.0" + default: "v1.82.0.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 b730c56..abc41c5 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.81.0.0' + default: '1.82.0.0' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.81.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.82.0.0, untagged-00000)" required: true - default: "v1.81.0.0" + default: "v1.82.0.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 6ccfbec..22a9111 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.81.0.0" + default: "1.82.0.0" release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.81.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.82.0.0, untagged-00000)" required: true - default: "v1.81.0.0" + default: "v1.82.0.0" jobs: get_release: From b7e970bfbd037cf73962b1763ec705954944051d Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Wed, 23 Oct 2024 14:47:41 +0100 Subject: [PATCH 2/4] Add analysis components to msvc builds --- .github/workflows/build-x86_64-pc-windows-msvc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-x86_64-pc-windows-msvc.yaml b/.github/workflows/build-x86_64-pc-windows-msvc.yaml index abc41c5..6774edc 100644 --- a/.github/workflows/build-x86_64-pc-windows-msvc.yaml +++ b/.github/workflows/build-x86_64-pc-windows-msvc.yaml @@ -59,7 +59,7 @@ jobs: working-directory: "R:" shell: powershell run: | - python src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${{ github.event.inputs.release_version }}" --enable-extended --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv --dist-compression-formats='xz' + python src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${{ github.event.inputs.release_version }}" --enable-extended --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,analysis,rust-analysis --dist-compression-formats='xz' --enable-lld - name: Build with x.py - dist packages working-directory: "R:" continue-on-error: true From eb1f33d6c978c6c4a84d0e01dcee275f2101e63f Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Wed, 23 Oct 2024 14:49:04 +0100 Subject: [PATCH 3/4] Fix repack --- support/rust-build/Repackage-RustRelease.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/rust-build/Repackage-RustRelease.ps1 b/support/rust-build/Repackage-RustRelease.ps1 index 274235f..1fba416 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.81.0.0" +$ReleaseVersion="1.82.0.0" if (Test-Path -Path esp -PathType Container) { Remove-Item -Recurse -Force -Path esp From 6cdeec5376fd36eda5be31ec40e4c9471c77a311 Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Thu, 24 Oct 2024 15:04:08 +0100 Subject: [PATCH 4/4] build src explicitely --- .github/workflows/build-aarch64-apple-darwin.yaml | 2 +- .github/workflows/build-x86_64-apple-darwin.yaml | 2 +- .github/workflows/build-x86_64-pc-windows-gnu.yaml | 2 +- .github/workflows/build-x86_64-pc-windows-msvc.yaml | 2 +- support/rust-build/aarch64-unknown-linux-gnu/build.sh | 2 +- .../x86_64-pc-windows-gnu/build-rust-toolchain-msys2.sh | 2 +- support/rust-build/x86_64-unknown-linux-gnu/build.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-aarch64-apple-darwin.yaml b/.github/workflows/build-aarch64-apple-darwin.yaml index fe463bd..0558338 100644 --- a/.github/workflows/build-aarch64-apple-darwin.yaml +++ b/.github/workflows/build-aarch64-apple-darwin.yaml @@ -54,7 +54,7 @@ jobs: submodules: true - name: Prepare build run: | - arch -arm64 python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${{ github.event.inputs.release_version }}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv --dist-compression-formats='xz' --set rust.jemalloc --enable-lld + arch -arm64 python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${{ github.event.inputs.release_version }}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --set rust.jemalloc --enable-lld - name: Build with x.py - dist packages - with cached LLVM run: arch -arm64 python3 x.py dist --stage 2 || echo "silence pkg build error" - name: Upload Release Asset diff --git a/.github/workflows/build-x86_64-apple-darwin.yaml b/.github/workflows/build-x86_64-apple-darwin.yaml index 73c4d7c..095f86d 100644 --- a/.github/workflows/build-x86_64-apple-darwin.yaml +++ b/.github/workflows/build-x86_64-apple-darwin.yaml @@ -55,7 +55,7 @@ jobs: submodules: true - name: Prepare build run: | - python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${{ github.event.inputs.release_version }}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv --dist-compression-formats='xz' --set rust.jemalloc --enable-lld + python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${{ github.event.inputs.release_version }}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --set rust.jemalloc --enable-lld - name: Build with x.py - dist packages run: | brew install ninja diff --git a/.github/workflows/build-x86_64-pc-windows-gnu.yaml b/.github/workflows/build-x86_64-pc-windows-gnu.yaml index 9c3bf83..722dc10 100644 --- a/.github/workflows/build-x86_64-pc-windows-gnu.yaml +++ b/.github/workflows/build-x86_64-pc-windows-gnu.yaml @@ -58,7 +58,7 @@ jobs: - name: Prepare build working-directory: "R:" run: | - C:\msys64\usr\bin\env.exe MSYSTEM=MINGW64 /usr/bin/bash -lc "cd /r; python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description='${{ github.event.inputs.release_version }}' --enable-extended --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv --dist-compression-formats='xz' --enable-lld" + C:\msys64\usr\bin\env.exe MSYSTEM=MINGW64 /usr/bin/bash -lc "cd /r; python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description='${{ github.event.inputs.release_version }}' --enable-extended --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld" - name: Build with x.py - dist packages id: build-rust working-directory: "R:" diff --git a/.github/workflows/build-x86_64-pc-windows-msvc.yaml b/.github/workflows/build-x86_64-pc-windows-msvc.yaml index 6774edc..2c936f3 100644 --- a/.github/workflows/build-x86_64-pc-windows-msvc.yaml +++ b/.github/workflows/build-x86_64-pc-windows-msvc.yaml @@ -59,7 +59,7 @@ jobs: working-directory: "R:" shell: powershell run: | - python src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${{ github.event.inputs.release_version }}" --enable-extended --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,analysis,rust-analysis --dist-compression-formats='xz' --enable-lld + python src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${{ github.event.inputs.release_version }}" --enable-extended --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,analysis,rust-analysis,src --dist-compression-formats='xz' --enable-lld - name: Build with x.py - dist packages working-directory: "R:" continue-on-error: true diff --git a/support/rust-build/aarch64-unknown-linux-gnu/build.sh b/support/rust-build/aarch64-unknown-linux-gnu/build.sh index 69793d8..2bcff4f 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 cd rust -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 --dist-compression-formats='xz' --enable-lld +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 python3 x.py dist --stage 2 diff --git a/support/rust-build/x86_64-pc-windows-gnu/build-rust-toolchain-msys2.sh b/support/rust-build/x86_64-pc-windows-gnu/build-rust-toolchain-msys2.sh index ad71926..96dfbeb 100644 --- a/support/rust-build/x86_64-pc-windows-gnu/build-rust-toolchain-msys2.sh +++ b/support/rust-build/x86_64-pc-windows-gnu/build-rust-toolchain-msys2.sh @@ -4,6 +4,6 @@ cd c: git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git r cd r -python3 src/bootstrap/configure.py --experimental-targets=Xtensa --enable-extended --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv --dist-compression-formats='xz' --host 'x86_64-pc-windows-gnu' --enable-lld +python3 src/bootstrap/configure.py --experimental-targets=Xtensa --enable-extended --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --host 'x86_64-pc-windows-gnu' --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 0f1d9a3..ce1dc1c 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 cd rust -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 --dist-compression-formats='xz' --enable-lld +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 python3 x.py dist --stage 2 \ No newline at end of file