From 18f11e9fa09c949b64213917ec4d1c1370fac461 Mon Sep 17 00:00:00 2001 From: Juraj Michalek Date: Wed, 31 May 2023 13:37:53 +0200 Subject: [PATCH] ci: bump up version number to 1.70.0.1 --- ...uild-rust-aarch64-apple-darwin-self-hosted-dispatch.yaml | 6 +++--- ...rust-aarch64-unknown-linux-gnu-self-hosted-dispatch.yaml | 6 +++--- .github/workflows/build-rust-all.yaml | 6 +++--- .github/workflows/build-rust-src-dispatch.yaml | 6 +++--- ...build-rust-x86_64-apple-darwin-self-hosted-dispatch.yaml | 6 +++--- ...ild-rust-x86_64-pc-windows-gnu-self-hosted-dispatch.yaml | 6 +++--- ...ld-rust-x86_64-pc-windows-msvc-self-hosted-dispatch.yaml | 6 +++--- ...-rust-x86_64-unknown-linux-gnu-self-hosted-dispatch.yaml | 6 +++--- .github/workflows/create-release.yaml | 4 ++-- .github/workflows/installer-check.yaml | 2 +- .github/workflows/publish-idf-rust-examples-image.yml | 2 +- .github/workflows/publish-idf-rust-image.yml | 2 +- .github/workflows/publish-idf-rust-tags.yml | 2 +- .github/workflows/release-installer-dispatch.yaml | 2 +- .../workflows/test-rust-aarch64-apple-darwin-dispatch.yaml | 2 +- .../workflows/test-rust-x86_64-apple-darwin-dispatch.yaml | 2 +- .../test-rust-x86_64-unknown-linux-gnu-dispatch.yaml | 2 +- README.md | 4 ++-- install-rust-toolchain.sh | 2 +- support/rust-build/Repackage-RustRelease.ps1 | 2 +- support/rust-build/rename-rust-release.sh | 2 +- test-rust-toolchain.sh | 2 +- 22 files changed, 40 insertions(+), 40 deletions(-) diff --git a/.github/workflows/build-rust-aarch64-apple-darwin-self-hosted-dispatch.yaml b/.github/workflows/build-rust-aarch64-apple-darwin-self-hosted-dispatch.yaml index bef7e0ff..33c72b67 100644 --- a/.github/workflows/build-rust-aarch64-apple-darwin-self-hosted-dispatch.yaml +++ b/.github/workflows/build-rust-aarch64-apple-darwin-self-hosted-dispatch.yaml @@ -10,11 +10,11 @@ on: rust_build_branch: description: "Branch of rust-build to use" required: true - default: "build/1.70.0.0" + default: "build/1.70.0.1" release_version: description: "Release Version for generation" required: true - default: '1.70.0.0' + default: '1.70.0.1' rust_version: description: "Version of esp rust to use" required: true @@ -24,7 +24,7 @@ on: required: true default: "aarch64-apple-darwin" release_tag: - description: "Tag used for uploading (e.g. v1.70.0.0, untagged-00000)" + description: "Tag used for uploading (e.g. v1.70.0.1, untagged-00000)" required: true default: "untagged-06704172812884cde852" diff --git a/.github/workflows/build-rust-aarch64-unknown-linux-gnu-self-hosted-dispatch.yaml b/.github/workflows/build-rust-aarch64-unknown-linux-gnu-self-hosted-dispatch.yaml index 6f29d418..3273be7a 100644 --- a/.github/workflows/build-rust-aarch64-unknown-linux-gnu-self-hosted-dispatch.yaml +++ b/.github/workflows/build-rust-aarch64-unknown-linux-gnu-self-hosted-dispatch.yaml @@ -10,11 +10,11 @@ on: rust_build_branch: description: "Branch of rust-build to use" required: true - default: "build/1.70.0.0" + default: "build/1.70.0.1" release_version: description: "Release Version for generation" required: true - default: '1.70.0.0' + default: '1.70.0.1' rust_version: description: "Version of esp rust to use" required: true @@ -24,7 +24,7 @@ on: required: true default: "aarch64-unknown-linux-gnu" release_tag: - description: "Tag used for uploading (e.g. v1.70.0.0, untagged-00000)" + description: "Tag used for uploading (e.g. v1.70.0.1, untagged-00000)" required: true default: "untagged-06704172812884cde852" diff --git a/.github/workflows/build-rust-all.yaml b/.github/workflows/build-rust-all.yaml index 1fbd732d..3172c333 100644 --- a/.github/workflows/build-rust-all.yaml +++ b/.github/workflows/build-rust-all.yaml @@ -10,17 +10,17 @@ on: rust_build_branch: description: "Branch of rust-build to use" required: true - default: "build/1.70.0.0" + default: "build/1.70.0.1" release_version: description: "Release Version for generation" required: true - default: '1.70.0.0' + default: '1.70.0.1' rust_version: description: "Version of esp rust to use" required: true default: "nightly" release_tag: - description: "Tag used for uploading (e.g. v1.70.0.0, untagged-00000)" + description: "Tag used for uploading (e.g. v1.70.0.1, untagged-00000)" required: true default: "untagged-06704172812884cde852" diff --git a/.github/workflows/build-rust-src-dispatch.yaml b/.github/workflows/build-rust-src-dispatch.yaml index 468c6c52..0ba8e2f5 100644 --- a/.github/workflows/build-rust-src-dispatch.yaml +++ b/.github/workflows/build-rust-src-dispatch.yaml @@ -10,17 +10,17 @@ on: rust_build_branch: description: "Branch of rust-build to use" required: true - default: "build/1.70.0.0" + default: "build/1.70.0.1" release_version: description: "Release Version for generation" required: true - default: '1.70.0.0' + default: '1.70.0.1' rust_version: description: "Version of esp rust to use" required: true default: "nightly" release_tag: - description: "Tag used for uploading (e.g. v1.70.0.0, untagged-00000)" + description: "Tag used for uploading (e.g. v1.70.0.1, untagged-00000)" required: true default: "untagged-06704172812884cde852" diff --git a/.github/workflows/build-rust-x86_64-apple-darwin-self-hosted-dispatch.yaml b/.github/workflows/build-rust-x86_64-apple-darwin-self-hosted-dispatch.yaml index 8e090457..d275b51f 100644 --- a/.github/workflows/build-rust-x86_64-apple-darwin-self-hosted-dispatch.yaml +++ b/.github/workflows/build-rust-x86_64-apple-darwin-self-hosted-dispatch.yaml @@ -10,11 +10,11 @@ on: rust_build_branch: description: "Branch of rust-build to use" required: true - default: "build/1.70.0.0" + default: "build/1.70.0.1" release_version: description: "Release Version for generation" required: true - default: '1.70.0.0' + default: '1.70.0.1' rust_version: description: "Version of esp rust to use" required: true @@ -24,7 +24,7 @@ on: required: true default: "x86_64-apple-darwin" release_tag: - description: "Tag used for uploading (e.g. v1.70.0.0, untagged-00000)" + description: "Tag used for uploading (e.g. v1.70.0.1, untagged-00000)" required: true default: "untagged-06704172812884cde852" diff --git a/.github/workflows/build-rust-x86_64-pc-windows-gnu-self-hosted-dispatch.yaml b/.github/workflows/build-rust-x86_64-pc-windows-gnu-self-hosted-dispatch.yaml index 32a664fa..583483d2 100644 --- a/.github/workflows/build-rust-x86_64-pc-windows-gnu-self-hosted-dispatch.yaml +++ b/.github/workflows/build-rust-x86_64-pc-windows-gnu-self-hosted-dispatch.yaml @@ -10,11 +10,11 @@ on: rust_build_branch: description: "Branch of rust-build to use" required: true - default: "build/1.70.0.0" + default: "build/1.70.0.1" release_version: description: "Release Version for generation" required: true - default: '1.70.0.0' + default: '1.70.0.1' rust_version: description: "Version of esp rust to use" required: true @@ -28,7 +28,7 @@ on: required: true default: "yes" release_tag: - description: "Tag used for uploading (e.g. v1.70.0.0, untagged-00000)" + description: "Tag used for uploading (e.g. v1.70.0.1, untagged-00000)" required: true default: "untagged-06704172812884cde852" diff --git a/.github/workflows/build-rust-x86_64-pc-windows-msvc-self-hosted-dispatch.yaml b/.github/workflows/build-rust-x86_64-pc-windows-msvc-self-hosted-dispatch.yaml index 9b67ba53..42a090ac 100644 --- a/.github/workflows/build-rust-x86_64-pc-windows-msvc-self-hosted-dispatch.yaml +++ b/.github/workflows/build-rust-x86_64-pc-windows-msvc-self-hosted-dispatch.yaml @@ -10,11 +10,11 @@ on: rust_build_branch: description: "Branch of rust-build to use" required: true - default: "build/1.70.0.0" + default: "build/1.70.0.1" release_version: description: "Release Version for generation" required: true - default: '1.70.0.0' + default: '1.70.0.1' rust_version: description: "Version of esp rust to use" required: true @@ -24,7 +24,7 @@ on: required: true default: "x86_64-pc-windows-msvc" release_tag: - description: "Tag used for uploading (e.g. v1.70.0.0, untagged-00000)" + description: "Tag used for uploading (e.g. v1.70.0.1, untagged-00000)" required: true default: "untagged-06704172812884cde852" diff --git a/.github/workflows/build-rust-x86_64-unknown-linux-gnu-self-hosted-dispatch.yaml b/.github/workflows/build-rust-x86_64-unknown-linux-gnu-self-hosted-dispatch.yaml index 88405c87..e640394f 100644 --- a/.github/workflows/build-rust-x86_64-unknown-linux-gnu-self-hosted-dispatch.yaml +++ b/.github/workflows/build-rust-x86_64-unknown-linux-gnu-self-hosted-dispatch.yaml @@ -10,11 +10,11 @@ on: rust_build_branch: description: "Branch of rust-build to use" required: true - default: "build/1.70.0.0" + default: "build/1.70.0.1" release_version: description: "Release Version for generation" required: true - default: "1.70.0.0" + default: "1.70.0.1" rust_version: description: "Version of esp rust to use" required: true @@ -24,7 +24,7 @@ on: required: true default: "x86_64-unknown-linux-gnu" release_tag: - description: "Tag used for uploading (e.g. v1.70.0.0, untagged-00000)" + description: "Tag used for uploading (e.g. v1.70.0.1, untagged-00000)" required: true default: "untagged-06704172812884cde852" diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml index 49571740..08c278e7 100644 --- a/.github/workflows/create-release.yaml +++ b/.github/workflows/create-release.yaml @@ -4,9 +4,9 @@ on: workflow_dispatch: inputs: tag_name: - description: "Tag for draft release (e.g. v1.70.0.0)" + description: "Tag for draft release (e.g. v1.70.0.1)" required: true - default: "v1.70.0.0" + default: "v1.70.0.1" jobs: create_release: diff --git a/.github/workflows/installer-check.yaml b/.github/workflows/installer-check.yaml index cd9ed5df..d5d474db 100644 --- a/.github/workflows/installer-check.yaml +++ b/.github/workflows/installer-check.yaml @@ -1,7 +1,7 @@ name: Test installer by building template projects env: - xtensa-toolchain-version: "1.70.0.0" + xtensa-toolchain-version: "1.70.0.1" on: push: diff --git a/.github/workflows/publish-idf-rust-examples-image.yml b/.github/workflows/publish-idf-rust-examples-image.yml index 743f04fa..a0dc8d29 100644 --- a/.github/workflows/publish-idf-rust-examples-image.yml +++ b/.github/workflows/publish-idf-rust-examples-image.yml @@ -10,7 +10,7 @@ on: release_version: description: "Release version - long 4 places for tag" required: true - default: "1.70.0.0" + default: "1.70.0.1" rust_patch_version: description: "Release patch version for generation - 3 places for tag" required: true diff --git a/.github/workflows/publish-idf-rust-image.yml b/.github/workflows/publish-idf-rust-image.yml index bd71f67c..d39661e8 100644 --- a/.github/workflows/publish-idf-rust-image.yml +++ b/.github/workflows/publish-idf-rust-image.yml @@ -10,7 +10,7 @@ on: release_version: description: "Release version - long 4 places for tag" required: true - default: "1.70.0.0" + default: "1.70.0.1" rust_patch_version: description: "Release patch version for generation - 3 places for tag" required: true diff --git a/.github/workflows/publish-idf-rust-tags.yml b/.github/workflows/publish-idf-rust-tags.yml index f04c8d9f..d2f9d8e2 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.70.0.0" + default: "1.70.0.1" publish: description: "Publish the tags to Dockehub?" required: true diff --git a/.github/workflows/release-installer-dispatch.yaml b/.github/workflows/release-installer-dispatch.yaml index 486785fb..0d5eb4a9 100644 --- a/.github/workflows/release-installer-dispatch.yaml +++ b/.github/workflows/release-installer-dispatch.yaml @@ -10,7 +10,7 @@ on: release_version: description: "Release Version for generation" required: true - default: "1.70.0.0" + default: "1.70.0.1" rust_version: description: "Version of esp rust to use" required: true diff --git a/.github/workflows/test-rust-aarch64-apple-darwin-dispatch.yaml b/.github/workflows/test-rust-aarch64-apple-darwin-dispatch.yaml index 95806439..2879e0c9 100644 --- a/.github/workflows/test-rust-aarch64-apple-darwin-dispatch.yaml +++ b/.github/workflows/test-rust-aarch64-apple-darwin-dispatch.yaml @@ -10,7 +10,7 @@ on: toolchain_version: description: "Version of Rust IDF toolchain" required: true - default: "1.70.0.0" + default: "1.70.0.1" target: description: "Target to build (e.g. xtensa-esp32-espidf)" required: true diff --git a/.github/workflows/test-rust-x86_64-apple-darwin-dispatch.yaml b/.github/workflows/test-rust-x86_64-apple-darwin-dispatch.yaml index d7fae442..090628ab 100644 --- a/.github/workflows/test-rust-x86_64-apple-darwin-dispatch.yaml +++ b/.github/workflows/test-rust-x86_64-apple-darwin-dispatch.yaml @@ -10,7 +10,7 @@ on: toolchain_version: description: "Version of Rust IDF toolchain" required: true - default: "1.70.0.0" + default: "1.70.0.1" jobs: build-idf-rust-examples: diff --git a/.github/workflows/test-rust-x86_64-unknown-linux-gnu-dispatch.yaml b/.github/workflows/test-rust-x86_64-unknown-linux-gnu-dispatch.yaml index 8dafc746..6292002f 100644 --- a/.github/workflows/test-rust-x86_64-unknown-linux-gnu-dispatch.yaml +++ b/.github/workflows/test-rust-x86_64-unknown-linux-gnu-dispatch.yaml @@ -10,7 +10,7 @@ on: toolchain_version: description: "Version of Rust IDF toolchain" required: true - default: "1.70.0.0" + default: "1.70.0.1" esp_idf_version: description: "Version of ESP-IDF for the build" required: true diff --git a/README.md b/README.md index e0e9f1bf..9b402c6c 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ Or, downloading the pre-compiled release binaries: **Deprecated method** ```bash -curl -LO https://github.com/esp-rs/rust-build/releases/download/v1.70.0.0/install-rust-toolchain.sh +curl -LO https://github.com/esp-rs/rust-build/releases/download/v1.70.0.1/install-rust-toolchain.sh chmod a+x install-rust-toolchain.sh ``` @@ -131,7 +131,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.70.0.0 +./install-rust-toolchain.sh --toolchain-version 1.70.0.1 . ./export-esp.sh ``` diff --git a/install-rust-toolchain.sh b/install-rust-toolchain.sh index fe5b0615..f100086e 100755 --- a/install-rust-toolchain.sh +++ b/install-rust-toolchain.sh @@ -4,7 +4,7 @@ set -eu #set -v # Default values -TOOLCHAIN_VERSION="1.70.0.0" +TOOLCHAIN_VERSION="1.70.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 bbfb98f2..9642db52 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.70.0.0" +$ReleaseVersion="1.70.0.1" if (Test-Path -Path esp -PathType Container) { Remove-Item -Recurse -Force -Path esp diff --git a/support/rust-build/rename-rust-release.sh b/support/rust-build/rename-rust-release.sh index d71bc073..c244d5ab 100755 --- a/support/rust-build/rename-rust-release.sh +++ b/support/rust-build/rename-rust-release.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash for I in *1.70.0-dev*; do - NEW_NAME=`echo $I | sed -e 's/1.70.0-dev/1.70.0.0/g'` + NEW_NAME=`echo $I | sed -e 's/1.70.0-dev/1.70.0.1/g'` mv $I $NEW_NAME done diff --git a/test-rust-toolchain.sh b/test-rust-toolchain.sh index 998f7139..0ac841a5 100755 --- a/test-rust-toolchain.sh +++ b/test-rust-toolchain.sh @@ -3,7 +3,7 @@ set -e # Default values -TOOLCHAIN_VERSION="1.70.0.0" +TOOLCHAIN_VERSION="1.70.0.1" if [ -z "${RUSTUP_HOME}" ]; then RUSTUP_HOME="${HOME}/.rustup" fi