From e131f4104054c52b8f3d17976dcee80755eddb1f Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Tue, 26 Nov 2024 11:33:57 +0000 Subject: [PATCH] build/1.83.0.0 --- .../workflows/build-aarch64-apple-darwin.yaml | 6 +-- .../build-aarch64-unknown-linux-gnu.yaml | 6 +-- .github/workflows/build-rust-src.yaml | 6 +-- .../workflows/build-x86_64-apple-darwin.yaml | 6 +-- .../build-x86_64-pc-windows-gnu.yaml | 6 +-- .../build-x86_64-pc-windows-msvc.yaml | 6 +-- .../build-x86_64-unknown-linux-gnu.yaml | 6 +-- .github/workflows/prepare-release.yaml | 42 ++----------------- .github/workflows/publish-idf-rust-tags.yml | 2 +- support/rust-build/Repackage-RustRelease.ps1 | 2 +- 10 files changed, 26 insertions(+), 62 deletions(-) diff --git a/.github/workflows/build-aarch64-apple-darwin.yaml b/.github/workflows/build-aarch64-apple-darwin.yaml index 52cba9c..e767983 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.82.0.3' + default: '1.83.0.0' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.82.0.3, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.83.0.0, untagged-00000)" required: true - default: "v1.82.0.3" + default: "v1.83.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 579266c..71a8196 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.82.0.3' + default: '1.83.0.0' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.82.0.3, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.83.0.0, untagged-00000)" required: true - default: "v1.82.0.3" + default: "v1.83.0.0" jobs: get_release: diff --git a/.github/workflows/build-rust-src.yaml b/.github/workflows/build-rust-src.yaml index d6a4489..f6b9799 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.82.0.3' + default: '1.83.0.0' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.82.0.3, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.83.0.0, untagged-00000)" required: true - default: "v1.82.0.3" + default: "v1.83.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 b066ff8..8f8998a 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.82.0.3' + default: '1.83.0.0' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.82.0.3, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.83.0.0, untagged-00000)" required: true - default: "v1.82.0.3" + default: "v1.83.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 5d8f29e..b9a6d18 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.82.0.3' + default: '1.83.0.0' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.82.0.3, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.83.0.0, untagged-00000)" required: true - default: "v1.82.0.3" + default: "v1.83.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 599b4cb..805a062 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.82.0.3' + default: '1.83.0.0' release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.82.0.3, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.83.0.0, untagged-00000)" required: true - default: "v1.82.0.3" + default: "v1.83.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 f4fd194..8a83dc9 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.82.0.3" + default: "1.83.0.0" release_tag: - description: "Release tag where artifacts will be stored (e.g. v1.82.0.3, untagged-00000)" + description: "Release tag where artifacts will be stored (e.g. v1.83.0.0, untagged-00000)" required: true - default: "v1.82.0.3" + default: "v1.83.0.0" jobs: get_release: diff --git a/.github/workflows/prepare-release.yaml b/.github/workflows/prepare-release.yaml index 0de4308..f3f0bf5 100644 --- a/.github/workflows/prepare-release.yaml +++ b/.github/workflows/prepare-release.yaml @@ -3,55 +3,19 @@ name: Prepare Release on: workflow_dispatch: inputs: - last_release: - description: "Previous Xtensa Rust release version" - required: true - default: "v1.82.0.3" next_release: description: "Next Xtensa Rust release version" required: true - default: "v1.82.0.3" + default: "v1.83.0.0" +env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 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@v7 - 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: mad9000/actions-find-and-replace-string@5 - id: findandreplace - with: - source: ${{ github.event.inputs.next_release }} - find: "v" - replace: "" - - name: Create Release uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: ${{ github.event.inputs.next_release }} release_name: Release ${{ github.event.inputs.next_release }} diff --git a/.github/workflows/publish-idf-rust-tags.yml b/.github/workflows/publish-idf-rust-tags.yml index 866d560..22f3bac 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.82.0.3" + default: "1.83.0.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 6c764dc..d20d14a 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.82.0.3" +$ReleaseVersion="1.83.0.0" if (Test-Path -Path esp -PathType Container) { Remove-Item -Recurse -Force -Path esp