From 8aac64115f1fbbe5e846e925110d5dee6d7f4951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraj=20Mich=C3=A1lek?= Date: Mon, 19 Feb 2024 09:49:22 +0100 Subject: [PATCH] Build/1.76.0.1 (#255) * ci: bump version to 1.76.0.1 * ci: switch to runner - self-hosted, Windows * ci: windows gnu remove matrix * ci: update Windows MSVC build --------- Co-authored-by: Sergio Gasquez --- .../workflows/build-aarch64-apple-darwin.yaml | 4 +-- .../build-aarch64-unknown-linux-gnu.yaml | 4 +-- .github/workflows/build-rust-artifacts.yaml | 4 +-- .github/workflows/build-rust-src.yaml | 4 +-- .../workflows/build-x86_64-apple-darwin.yaml | 4 +-- .../build-x86_64-pc-windows-gnu.yaml | 30 ++++------------- .../build-x86_64-pc-windows-msvc.yaml | 32 +++++++------------ .../build-x86_64-unknown-linux-gnu.yaml | 4 +-- .github/workflows/prepare-release.yaml | 4 +-- .github/workflows/publish-idf-rust-tags.yml | 2 +- support/rust-build/Repackage-RustRelease.ps1 | 2 +- .../Prepare-BuildEnvironment.ps1 | 5 ++- 12 files changed, 37 insertions(+), 62 deletions(-) diff --git a/.github/workflows/build-aarch64-apple-darwin.yaml b/.github/workflows/build-aarch64-apple-darwin.yaml index c31bf71..6b37d71 100644 --- a/.github/workflows/build-aarch64-apple-darwin.yaml +++ b/.github/workflows/build-aarch64-apple-darwin.yaml @@ -6,9 +6,9 @@ on: release_version: description: "Xtensa Rust release version to build" required: true - default: '1.75.0.0' + default: '1.76.0.1' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.75.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.76.0.1, untagged-00000)" required: true default: "untagged-3ecdd54e672f465cad2e" diff --git a/.github/workflows/build-aarch64-unknown-linux-gnu.yaml b/.github/workflows/build-aarch64-unknown-linux-gnu.yaml index ed31d7a..3a9c4af 100644 --- a/.github/workflows/build-aarch64-unknown-linux-gnu.yaml +++ b/.github/workflows/build-aarch64-unknown-linux-gnu.yaml @@ -6,9 +6,9 @@ on: release_version: description: "Xtensa Rust release version to build" required: true - default: '1.75.0.0' + default: '1.76.0.1' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.75.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.76.0.1, untagged-00000)" required: true default: "untagged-3ecdd54e672f465cad2e" diff --git a/.github/workflows/build-rust-artifacts.yaml b/.github/workflows/build-rust-artifacts.yaml index b49dced..1aa859b 100644 --- a/.github/workflows/build-rust-artifacts.yaml +++ b/.github/workflows/build-rust-artifacts.yaml @@ -6,9 +6,9 @@ on: release_version: description: "Xtensa Rust release version to build" required: true - default: '1.75.0.0' + default: '1.76.0.1' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.75.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.76.0.1, untagged-00000)" required: true default: "untagged-3ecdd54e672f465cad2e" aarch64-apple-darwin: diff --git a/.github/workflows/build-rust-src.yaml b/.github/workflows/build-rust-src.yaml index 168c517..442fd97 100644 --- a/.github/workflows/build-rust-src.yaml +++ b/.github/workflows/build-rust-src.yaml @@ -6,9 +6,9 @@ on: release_version: description: "Xtensa Rust release version to build" required: true - default: '1.75.0.0' + default: '1.76.0.1' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.75.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.76.0.1, untagged-00000)" required: true default: "untagged-3ecdd54e672f465cad2e" diff --git a/.github/workflows/build-x86_64-apple-darwin.yaml b/.github/workflows/build-x86_64-apple-darwin.yaml index 774a3a2..bced4ba 100644 --- a/.github/workflows/build-x86_64-apple-darwin.yaml +++ b/.github/workflows/build-x86_64-apple-darwin.yaml @@ -5,9 +5,9 @@ on: release_version: description: "Xtensa Rust release version to build" required: true - default: '1.75.0.0' + default: '1.76.0.1' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.75.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.76.0.1, untagged-00000)" required: true default: "untagged-3ecdd54e672f465cad2e" diff --git a/.github/workflows/build-x86_64-pc-windows-gnu.yaml b/.github/workflows/build-x86_64-pc-windows-gnu.yaml index d32090b..e20d730 100644 --- a/.github/workflows/build-x86_64-pc-windows-gnu.yaml +++ b/.github/workflows/build-x86_64-pc-windows-gnu.yaml @@ -6,9 +6,9 @@ on: release_version: description: "Xtensa Rust release version to build" required: true - default: '1.75.0.0' + default: '1.76.0.1' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.75.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.76.0.1, untagged-00000)" required: true default: "untagged-3ecdd54e672f465cad2e" @@ -36,15 +36,7 @@ jobs: build-xtensa-rust: name: Build Xtensa Rust needs: get_release - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [x86_64-pc-windows-gnu-self-hosted] - include: - - os: x86_64-pc-windows-gnu-self-hosted - ASSET_PATH: "rust/build/dist/rust-${{ github.event.inputs.release_version }}-x86_64-pc-windows-gnu.zip" - ASSET_NAME: "rust-${{ github.event.inputs.release_version }}-x86_64-pc-windows-gnu.zip" - ASSET_CONTENT_TYPE: "application/x-tar" + runs-on: [self-hosted, Windows] steps: - name: Checkout repository uses: actions/checkout@v4 @@ -72,14 +64,6 @@ jobs: working-directory: "R:" continue-on-error: true run: C:\msys64\usr\bin\env.exe MSYSTEM=MINGW64 /usr/bin/bash -lc "cd /r; python3 x.py dist --stage 2" - # This step make sense only on Azure runners with 8 cores and 16 GB RAM, - # because LLVM OOMs. Either increase memory or decrease number of parallel processes. - #- name: Retry build with x.py - dist packages - in case of failure on LLVM OOM - # id: retry-build-rust - # if: steps.build-rust.outcome == 'failure' - # working-directory: "R:" - # continue-on-error: true - # run: C:\msys64\usr\bin\env.exe MSYSTEM=MINGW64 /usr/bin/bash -lc "cd /r; python3 x.py dist --stage 2" - name: Repackage binary id: repackage-binary continue-on-error: true @@ -89,16 +73,14 @@ jobs: &"$env:GITHUB_WORKSPACE/support/rust-build/Repackage-RustRelease.ps1" -DefaultHost x86_64-pc-windows-gnu - name: Upload Release Asset if: steps.repackage-binary.outcome != 'failure' - id: upload-release-asset - continue-on-error: true uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.get_release.outputs.upload_url }} - asset_path: ${{ matrix.ASSET_PATH }} - asset_name: ${{ matrix.ASSET_NAME }} - asset_content_type: ${{ matrix.ASSET_CONTENT_TYPE }} + asset_path: rust/build/dist/rust-${{ github.event.inputs.release_version }}-x86_64-pc-windows-gnu.zip + asset_name: rust-${{ github.event.inputs.release_version }}-x86_64-pc-windows-gnu.zip + asset_content_type: application/x-tar - name: Unmount local drive id: unount_path continue-on-error: true diff --git a/.github/workflows/build-x86_64-pc-windows-msvc.yaml b/.github/workflows/build-x86_64-pc-windows-msvc.yaml index 7be762d..4d7e976 100644 --- a/.github/workflows/build-x86_64-pc-windows-msvc.yaml +++ b/.github/workflows/build-x86_64-pc-windows-msvc.yaml @@ -6,9 +6,9 @@ on: release_version: description: "Xtensa Rust release version to build" required: true - default: '1.75.0.0' + default: '1.76.0.1' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.75.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.76.0.1, untagged-00000)" required: true default: "untagged-3ecdd54e672f465cad2e" @@ -36,21 +36,8 @@ jobs: build-xtensa-rust: name: Build Xtensa Rust needs: get_release - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [x86_64-pc-windows-msvc-self-hosted] - # os: [windows-latest] - include: - - os: x86_64-pc-windows-msvc-self-hosted - ASSET_PATH: "rust/build/dist/rust-${{ github.event.inputs.release_version }}-x86_64-pc-windows-msvc.zip" - ASSET_NAME: "rust-${{ github.event.inputs.release_version }}-x86_64-pc-windows-msvc.zip" - ASSET_CONTENT_TYPE: "application/x-tar" + runs-on: [self-hosted, Windows] steps: - # - name: Setup Ninja - # uses: ashutoshvarma/setup-ninja@master - # with: - # version: 1.10.0 - name: Checkout repository uses: actions/checkout@v4 - name: Checkout repository - esp-rs/rust @@ -70,17 +57,20 @@ jobs: run: subst "R:" "$env:GITHUB_WORKSPACE\rust" - name: Prepare build 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' --enable-lld - name: Build with x.py - dist packages working-directory: "R:" continue-on-error: true - run: python x.py dist --stage 2 + shell: powershell + run: | + python x.py dist --stage 2 - name: Repackage binary shell: powershell working-directory: "R:/build/dist" run: | - &"$env:GITHUB_WORKSPACE/support/rust-build/Repackage-RustRelease.ps1" + &"$env:GITHUB_WORKSPACE/support/rust-build/Repackage-RustRelease.ps1" -DefaultHost x86_64-pc-windows-msvc - name: Upload Release Asset id: upload-release-asset uses: actions/upload-release-asset@v1 @@ -88,9 +78,9 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.get_release.outputs.upload_url }} - asset_path: ${{ matrix.ASSET_PATH }} - asset_name: ${{ matrix.ASSET_NAME }} - asset_content_type: ${{ matrix.ASSET_CONTENT_TYPE }} + asset_path: rust/build/dist/rust-${{ github.event.inputs.release_version }}-x86_64-pc-windows-msvc.zip + asset_name: rust-${{ github.event.inputs.release_version }}-x86_64-pc-windows-msvc.zip + asset_content_type: application/x-tar - name: Unmount local drive id: unount_path continue-on-error: true diff --git a/.github/workflows/build-x86_64-unknown-linux-gnu.yaml b/.github/workflows/build-x86_64-unknown-linux-gnu.yaml index a8526ef..48f35a1 100644 --- a/.github/workflows/build-x86_64-unknown-linux-gnu.yaml +++ b/.github/workflows/build-x86_64-unknown-linux-gnu.yaml @@ -5,9 +5,9 @@ on: release_version: description: "Xtensa Rust release version to build" required: true - default: "1.75.0.0" + default: "1.76.0.1" release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.75.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.76.0.1, untagged-00000)" required: true default: "untagged-3ecdd54e672f465cad2e" diff --git a/.github/workflows/prepare-release.yaml b/.github/workflows/prepare-release.yaml index 3b4a44e..1ceb259 100644 --- a/.github/workflows/prepare-release.yaml +++ b/.github/workflows/prepare-release.yaml @@ -6,11 +6,11 @@ on: last_release: description: "Previous Xtensa Rust release version" required: true - default: '1.75.0.0' + default: '1.76.0.1' next_release: description: "Next Xtensa Rust release version" required: true - default: "1.75.0.0" + default: "1.76.0.1" jobs: prepare-release: diff --git a/.github/workflows/publish-idf-rust-tags.yml b/.github/workflows/publish-idf-rust-tags.yml index 15a09fe..1258b6b 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.75.0.0" + default: "1.76.0.1" 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 d0f6d13..3dd6865 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.75.0.0" +$ReleaseVersion="1.76.0.1" if (Test-Path -Path esp -PathType Container) { Remove-Item -Recurse -Force -Path esp diff --git a/support/rust-build/x86_64-pc-windows-msvc/Prepare-BuildEnvironment.ps1 b/support/rust-build/x86_64-pc-windows-msvc/Prepare-BuildEnvironment.ps1 index 9cd4762..4d833a5 100644 --- a/support/rust-build/x86_64-pc-windows-msvc/Prepare-BuildEnvironment.ps1 +++ b/support/rust-build/x86_64-pc-windows-msvc/Prepare-BuildEnvironment.ps1 @@ -6,7 +6,7 @@ winget install --id Git.Git --accept-source-agreements winget install --id 7zip.7zip winget install --id Python.Python.3.12 --scope machine winget install --id Kitware.CMake -winget install --id Ninja-build.Ninja +winget install --id Ninja-build.Ninja --scope machine wget https://aka.ms/vs/17/release/vs_buildtools.exe -OutFile vs_buildtools.exe .\vs_buildtools.exe --passive --wait --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows11SDK.22621 @@ -16,3 +16,6 @@ wget https://aka.ms/vs/17/release/vs_buildtools.exe -OutFile vs_buildtools.exe #winget install Microsoft.VisualStudio.2022.BuildTools --silent --override "--wait --quiet --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64" setx /M PATH "$env:PATH;C:\Program Files\7-Zip" + +# Register path to system wide Ninja +setx /M PATH="$env:PATH;C:\Program Files\WinGet\Links"