diff --git a/.github/workflows/build-aarch64-apple-darwin.yaml b/.github/workflows/build-aarch64-apple-darwin.yaml index 687221c..e6ddef1 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.74.0.0' + default: '1.74.0.1' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.74.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 be299a6..852245a 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.74.0.0' + default: '1.74.0.1' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.74.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 abe1f8e..c09e1a1 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.74.0.0' + default: '1.74.0.1' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.74.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 654a131..1cfc13c 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.74.0.0' + default: '1.74.0.1' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.74.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 58a66a6..db635b3 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.74.0.0' + default: '1.74.0.1' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.74.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 4475de1..ee9599e 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.74.0.0' + default: '1.74.0.1' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.74.0.1, untagged-00000)" required: true default: "untagged-3ecdd54e672f465cad2e" diff --git a/.github/workflows/build-x86_64-pc-windows-msvc.yaml b/.github/workflows/build-x86_64-pc-windows-msvc.yaml index b7da37f..bb05a97 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.74.0.0' + default: '1.74.0.1' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.74.0.1, untagged-00000)" required: true default: "untagged-3ecdd54e672f465cad2e" diff --git a/.github/workflows/build-x86_64-unknown-linux-gnu.yaml b/.github/workflows/build-x86_64-unknown-linux-gnu.yaml index 9f631df..7078b61 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.74.0.0" + default: "1.74.0.1" release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.74.0.1, untagged-00000)" required: true default: "untagged-3ecdd54e672f465cad2e" diff --git a/.github/workflows/prepare-release.yaml b/.github/workflows/prepare-release.yaml index 2bed9e8..5918631 100644 --- a/.github/workflows/prepare-release.yaml +++ b/.github/workflows/prepare-release.yaml @@ -6,37 +6,37 @@ on: last_release: description: "Previous Xtensa Rust release version" required: true - default: '1.74.0.0' + default: '1.74.0.1' next_release: description: "Next Xtensa Rust release version" required: true - default: "1.74.0.0" + default: "1.74.0.1" jobs: prepare-release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Replace Xtensa Rust versions - run: | - find . -type f -exec sed -i 's/${{ github.event.inputs.last_release }}/${{ github.event.inputs.next_release }}/g' {} \; - - name: Commit changes - uses: EndBug/add-and-commit@v9 - with: - default_author: github_actions - add: '*' - message: 'Bump Xtensa Rust version to ${{ github.event.inputs.next_release }}' - new_branch: build/${{ github.event.inputs.next_release }} - - name: Create Pull Request - uses: peter-evans/create-pull-request@v5 - with: - token: ${{ secrets.PAT }} - branch: build/${{ github.event.inputs.next_release }} - base: main - delete-branch: false - title: 'Update Xtensa Rust version to ${{ github.event.inputs.next_release }}' - body: - draft: false + # - uses: actions/checkout@v4 + # - name: Replace Xtensa Rust versions + # run: | + # find . -type f -exec sed -i 's/${{ github.event.inputs.last_release }}/${{ github.event.inputs.next_release }}/g' {} \; + # - name: Commit changes + # uses: EndBug/add-and-commit@v9 + # with: + # default_author: github_actions + # add: '*' + # message: 'Bump Xtensa Rust version to ${{ github.event.inputs.next_release }}' + # new_branch: build/${{ github.event.inputs.next_release }} + # - name: Create Pull Request + # uses: peter-evans/create-pull-request@v5 + # with: + # token: ${{ secrets.PAT }} + # branch: build/${{ github.event.inputs.next_release }} + # base: main + # delete-branch: false + # title: 'Update Xtensa Rust version to ${{ github.event.inputs.next_release }}' + # body: + # draft: false - name: Create Release uses: actions/create-release@v1 env: @@ -46,13 +46,3 @@ jobs: release_name: Release ${{ github.event.inputs.next_release }} draft: true prerelease: true - check-selfhoste-builders: - name: Check builders - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ "macos-m1-self-hosted", "macos-x86_64-self-hosted", "x86_64-pc-windows-gnu-self-hosted", "windows-x86_64-self-hosted" ] - steps: - - name: Simple test - run: echo "Test" diff --git a/.github/workflows/publish-idf-rust-tags.yml b/.github/workflows/publish-idf-rust-tags.yml index 7723ee6..63c496a 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.74.0.0" + default: "1.74.0.1" publish: description: "Publish the tags to Dockehub?" required: true diff --git a/.github/workflows/upload-installer.yaml b/.github/workflows/upload-installer.yaml index e2226c2..ca69ef1 100644 --- a/.github/workflows/upload-installer.yaml +++ b/.github/workflows/upload-installer.yaml @@ -10,7 +10,7 @@ on: release_version: description: "Release Version for generation" required: true - default: "1.74.0.0" + default: "1.74.0.1" rust_version: description: "Version of esp rust to use" required: true diff --git a/README.md b/README.md index eff07b1..c77b0f9 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ Or, downloading the pre-compiled release binaries: **Deprecated method** ```bash -curl -LO https://github.com/esp-rs/rust-build/releases/download/v1.74.0.0/install-rust-toolchain.sh +curl -LO https://github.com/esp-rs/rust-build/releases/download/v1.74.0.1/install-rust-toolchain.sh chmod a+x install-rust-toolchain.sh ``` @@ -130,7 +130,7 @@ Run `./install-rust-toolchain.sh --help` for more information about arguments. Installation of different version of the toolchain: ``` -./install-rust-toolchain.sh --toolchain-version 1.74.0.0 +./install-rust-toolchain.sh --toolchain-version 1.74.0.1 . ./export-esp.sh ``` diff --git a/install-rust-toolchain.sh b/install-rust-toolchain.sh index eef1e3d..8f18ee7 100755 --- a/install-rust-toolchain.sh +++ b/install-rust-toolchain.sh @@ -4,7 +4,7 @@ set -eu #set -v # Default values -TOOLCHAIN_VERSION="1.74.0.0" +TOOLCHAIN_VERSION="1.74.0.1" RUSTUP_HOME="${RUSTUP_HOME:-${HOME}/.rustup}" CARGO_HOME="${CARGO_HOME:-${HOME}/.cargo}" TOOLCHAIN_DESTINATION_DIR="${RUSTUP_HOME}/toolchains/esp" diff --git a/support/rust-build/Repackage-RustRelease.ps1 b/support/rust-build/Repackage-RustRelease.ps1 index 45b515d..a80e508 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.74.0.0" +$ReleaseVersion="1.74.0.1" if (Test-Path -Path esp -PathType Container) { Remove-Item -Recurse -Force -Path esp