ci: bump up version to 1.61.0.0

esp-rs · May 17, 2022 · e86a943 · e86a943
1 parent 8046203
commit e86a943
Show file tree

Hide file tree

Showing 21 changed files with 27 additions and 27 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
@@ -15,7 +15,7 @@ on:
       release_version:
         description: 'Release Version for generation'
         required: true
-        default: '1.60.0.1'
+        default: '1.61.0.0'
       rust_version:
         description: 'Version of esp rust to use'
         required: true

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
@@ -15,7 +15,7 @@ on:
       release_version:
         description: 'Release Version for generation'
         required: true
-        default: '1.60.0.1'
+        default: '1.61.0.0'
       rust_version:
         description: 'Version of esp rust to use'
         required: true

diff --git a/.github/workflows/build-rust-src-dispatch.yaml b/.github/workflows/build-rust-src-dispatch.yaml
@@ -14,7 +14,7 @@ on:
       release_version:
         description: 'Release Version for generation'
         required: true
-        default: '1.60.0.1'
+        default: '1.61.0.0'
       rust_version:
         description: 'Version of esp rust to use'
         required: true

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
@@ -15,7 +15,7 @@ on:
       release_version:
         description: 'Release Version for generation'
         required: true
-        default: '1.60.0.1'
+        default: '1.61.0.0'
       rust_version:
         description: 'Version of esp rust to use'
         required: true

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
@@ -15,7 +15,7 @@ on:
       release_version:
         description: 'Release Version for generation'
         required: true
-        default: '1.60.0.1'
+        default: '1.61.0.0'
       rust_version:
         description: 'Version of esp rust to use'
         required: true

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
@@ -15,7 +15,7 @@ on:
       release_version:
         description: 'Release Version for generation'
         required: true
-        default: '1.60.0.1'
+        default: '1.61.0.0'
       rust_version:
         description: 'Version of esp rust to use'
         required: true

diff --git a/.github/workflows/publish-idf-rust-examples-image.yml b/.github/workflows/publish-idf-rust-examples-image.yml
@@ -10,11 +10,11 @@ on:
       release_version:
         description: 'Release version - long 4 places for tag'
         required: true
-        default: '1.60.0.1'
+        default: '1.61.0.0'
       rust_patch_version:
         description: 'Release patch version for generation - 3 places for tag'
         required: true
-        default: '1.60.0'
+        default: '1.61.0'
       rust_minor_version:
         description: 'Release minor version - 2 places for tag'
         required: true

diff --git a/.github/workflows/publish-idf-rust-image.yml b/.github/workflows/publish-idf-rust-image.yml
@@ -10,11 +10,11 @@ on:
       release_version:
         description: 'Release version - long 4 places for tag'
         required: true
-        default: '1.60.0.1'
+        default: '1.61.0.0'
       rust_patch_version:
         description: 'Release patch version for generation - 3 places for tag'
         required: true
-        default: '1.60.0'
+        default: '1.61.0'
       rust_minor_version:
         description: 'Release minor version - 2 places for tag'
         required: true

diff --git a/.github/workflows/release-installer-dispatch.yaml b/.github/workflows/release-installer-dispatch.yaml
@@ -10,11 +10,11 @@ on:
       release_version:
         description: 'Release Version for generation'
         required: true
-        default: '1.60.0.1'
+        default: '1.61.0.0'
       rust_version:
         description: 'Version of esp rust to use'
         required: true
-        default: '1.60.0'
+        default: '1.61.0'
 
 
 # We Break this down into individual jobs to avoid disk space issues

diff --git 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.60.0.1'
+        default: '1.61.0.0'
       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
@@ -10,7 +10,7 @@ on:
       toolchain_version:
         description: 'Version of Rust IDF toolchain'
         required: true
-        default: '1.60.0.1'
+        default: '1.61.0.0'
 
 jobs:
   build-idf-rust-examples:

diff --git a/.github/workflows/test-rust-x86_64-pc-windows-msvc-dispatch.yaml b/.github/workflows/test-rust-x86_64-pc-windows-msvc-dispatch.yaml
@@ -10,7 +10,7 @@ on:
       toolchain_version:
         description: 'Version of Rust IDF toolchain'
         required: true
-        default: '1.60.0.1'
+        default: '1.61.0.0'
 
 jobs:
   build-idf-rust-examples:

diff --git a/.github/workflows/test-rust-x86_64-pc-windows-msvc-self-hosted-dispatch.yaml b/.github/workflows/test-rust-x86_64-pc-windows-msvc-self-hosted-dispatch.yaml
@@ -20,7 +20,7 @@ jobs:
           ARCH: ''
           TARGET: win-x64
           ASSET_PATH: 'build/dist/esp.zip'
-          ASSET_NAME: 'rust-1.60.0.1-x86_64-pc-windows-msvc.zip'
+          ASSET_NAME: 'rust-1.61.0.0-x86_64-pc-windows-msvc.zip'
           ASSET_CONTENT_TYPE: 'application/zip'
           LLVM_ROOT_OPTION: '--llvm-root=C:/llvm-project'
     steps:

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
@@ -10,7 +10,7 @@ on:
       toolchain_version:
         description: 'Version of Rust IDF toolchain'
         required: true
-        default: '1.60.0.1'
+        default: '1.61.0.0'
       esp_idf_version:
         description: 'Version of ESP-IDF for the build'
         required: true

diff --git a/Install-RustToolchain.ps1 b/Install-RustToolchain.ps1
@@ -4,7 +4,7 @@ param (
     [String]
     $ExportFile = '',
     [String]
-    $ToolchainVersion = '1.60.0.1',
+    $ToolchainVersion = '1.61.0.0',
     [String]
     $ToolchainDestination = "${HOME}/.rustup/toolchains/esp",
     [String]

diff --git a/README.md b/README.md
@@ -75,7 +75,7 @@ Export variables are displayed at the end of the output from the script.
 Installation of different version of toolchain:
 
 ```
-./Install-RustToolchain.sh --toolchain-version 1.60.0.1 --export-file Export-EspRust.ps1
+./Install-RustToolchain.sh --toolchain-version 1.61.0.0 --export-file Export-EspRust.ps1
 source ./Export-EspRust.ps1
 ```
 

diff --git a/Test-RustToolchain.ps1 b/Test-RustToolchain.ps1
@@ -2,7 +2,7 @@
 param (
     [Parameter()]
     [String]
-    $ToolchainVersion = '1.60.0.1',
+    $ToolchainVersion = '1.61.0.0',
     [String]
     [ValidateSet("xtensa-esp32-espidf", "xtensa-esp32s2-espidf", "xtensa-esp32s3-espidf", "riscv32imc-esp-espidf")]
     $Target = "xtensa-esp32-espidf",

diff --git a/install-rust-toolchain.sh b/install-rust-toolchain.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Default values
-TOOLCHAIN_VERSION="1.60.0.1"
+TOOLCHAIN_VERSION="1.61.0.0"
 if [ -z "${RUSTUP_HOME}" ]; then
     RUSTUP_HOME="${HOME}/.rustup"
 fi
@@ -298,9 +298,9 @@ elif [ ${ARCH} == "x86_64-unknown-linux-gnu" ]; then
     GCC_ARCH="linux-amd64"
     ESPFLASH_URL="https://github.com/esp-rs/espflash/releases/latest/download/cargo-espflash-${ARCH}.zip"
     ESPFLASH_BIN="${CARGO_HOME}/bin/cargo-espflash"
-    LDPROXY_URL="https://github.com/esp-rs/rust-build/releases/download/v1.60.0.1/ldproxy-0.3.0-x86_64-unknown-linux-gnu.xz"
+    LDPROXY_URL="https://github.com/esp-rs/rust-build/releases/download/v1.61.0.0/ldproxy-0.3.0-x86_64-unknown-linux-gnu.xz"
     LDPROXY_BIN="${CARGO_HOME}/bin/ldproxy"
-    ESPMONITOR_URL="https://github.com/esp-rs/rust-build/releases/download/v1.60.0.1/espmonitor-0.7.0-x86_64-unknown-linux-gnu.xz"
+    ESPMONITOR_URL="https://github.com/esp-rs/rust-build/releases/download/v1.61.0.0/espmonitor-0.7.0-x86_64-unknown-linux-gnu.xz"
     ESPMONITOR_BIN="${CARGO_HOME}/bin/espmonitor"
     LLVM_DIST_MIRROR="https://github.com/esp-rs/rust-build/releases/download/v${TOOLCHAIN_VERSION}"
 elif [ ${ARCH} == "aarch64-unknown-linux-gnu" ]; then

diff --git a/support/rust-build/Repackage-RustRelease.ps1 b/support/rust-build/Repackage-RustRelease.ps1
@@ -4,7 +4,7 @@
 $ErrorActionPreference = "Stop"
 
 $RustVersion="nightly"
-$ReleaseVersion="1.60.0.1"
+$ReleaseVersion="1.61.0.0"
 
 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
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-for I in *1.60.0-dev*; do
-     NEW_NAME=`echo $I | sed -e 's/1.60.0-dev/1.60.0.1/g'`
+for I in *1.61.0-dev*; do
+     NEW_NAME=`echo $I | sed -e 's/1.61.0-dev/1.61.0.0/g'`
      mv $I $NEW_NAME
 done
 
diff --git a/test-rust-toolchain.sh b/test-rust-toolchain.sh
@@ -3,7 +3,7 @@
 set -e
 
 # Default values
-TOOLCHAIN_VERSION="1.60.0.1"
+TOOLCHAIN_VERSION="1.61.0.0"
 if [ -z "${RUSTUP_HOME}" ]; then
     RUSTUP_HOME="${HOME}/.rustup"
 fi