build: update to version 1.57.0.0

esp-rs · Dec 2, 2021 · 784d43a · 784d43a
1 parent 40943e8
commit 784d43a
Show file tree

Hide file tree

Showing 17 changed files with 41 additions and 199 deletions.
diff --git a/.github/actions/util/setup-envs/action.yaml b/.github/actions/util/setup-envs/action.yaml
@@ -23,7 +23,7 @@ runs:
         # esp rust version to checkout
         echo "rust_ver=${{ github.event.inputs.rust_ver }}" >> $GITHUB_ENV
 
-        # Describes part of the file name generated during the build 
+        # Describes part of the file name generated during the build
         echo "build_suffix=${{ github.event.inputs.rust_ver }}-dev-${{ matrix.target_name }}" >> $GITHUB_ENV
 
         # release version
@@ -70,9 +70,9 @@ runs:
 #    - name: Debug Output Env Variables
 #      shell: bash
 #      run: |
-#        echo "rust_ver: ${{ env.rust_ver }}"
+#        echo "rust_version: ${{ env.rust_ver }}"
 #        echo "build_suffix: ${{ env.build_suffix }}"
-#        echo "release_ver: ${{ env.release_ver }}"
+#        echo "release_version: ${{ env.release_ver }}"
 #        echo "asset_name: ${{ env.asset_name }}"
 #        echo "work_dir: ${{ env.work_dir }}"
 #        echo "dist_dir: ${{ env.dist_dir }}"
diff --git a/.github/workflows/build-rust-aarch64-apple-darwin-dispatch.yaml b/.github/workflows/build-rust-aarch64-apple-darwin-dispatch.yaml
@@ -40,16 +40,16 @@ jobs:
         - os: macos-m1-self-hosted
           ARCH: ''
           TARGET: win-x64
-          ASSET_PATH: 'build/dist/rust-1.56.0-dev-aarch64-apple-darwin.tar.xz'
-          ASSET_NAME: 'rust-1.56.0.1-dev-aarch64-apple-darwin.tar.xz'
+          ASSET_PATH: 'build/dist/rust-1.57.0-dev-aarch64-apple-darwin.tar.xz'
+          ASSET_NAME: 'rust-1.57.0.0-dev-aarch64-apple-darwin.tar.xz'
           ASSET_CONTENT_TYPE: 'application/x-tar'
           LLVM_ROOT_OPTION: ''
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
         with:
           repository: esp-rs/rust
-          ref: esp-1.56.0
+          ref: esp-1.57.0.0
           submodules: true
       - name: Set up Python
         if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-18.04' || matrix.os == 'windows-latest' }}

diff --git a/.github/workflows/build-rust-dispatch.yaml b/.github/workflows/build-rust-dispatch.yaml
diff --git a/.github/workflows/build-rust-src-dispatch.yaml b/.github/workflows/build-rust-src-dispatch.yaml
@@ -7,14 +7,14 @@ on:
         description: 'Branch of rust-build to use'
         required: true
         default: 'main'
-      release_ver:
+      release_version:
         description: 'Release Version for generation'
         required: true
-        default: '1.56.0.1'
-      rust_ver:
+        default: '1.57.0.0'
+      rust_version:
         description: 'Version of esp rust to use'
         required: true
-        default: '1.56.0'
+        default: '1.57.0'
 
 
 jobs:
@@ -70,13 +70,13 @@ jobs:
 
       - name: Read Artifact - Src
         uses: actions/download-artifact@v2
-        with: 
-          name: rust-src-${{ env.rust_ver }}-dev.tar.xz
+        with:
+          name: rust-src-${{ env.rust_version }}-dev.tar.xz
 
       - name: Rename file
         shell: bash
         run: |
-          mv rust-src-${{ env.rust_ver }}-dev.tar.xz rust-src-${{ env.release_ver }}.tar.xz
-          echo "asset_name=rust-src-${{ env.release_ver }}.tar.xz" >> $GITHUB_ENV
+          mv rust-src-${{ env.rust_version }}-dev.tar.xz rust-src-${{ env.release_version }}.tar.xz
+          echo "asset_name=rust-src-${{ env.release_version }}.tar.xz" >> $GITHUB_ENV
 
       - uses: ./rust-build/.github/actions/util/upload
diff --git a/.github/workflows/build-rust-x86_64-apple-darwin-dispatch.yaml b/.github/workflows/build-rust-x86_64-apple-darwin-dispatch.yaml
@@ -7,14 +7,14 @@ on:
         description: 'Branch of rust-build to use'
         required: true
         default: 'main'
-      release_ver:
+      release_version:
         description: 'Release Version for generation'
         required: true
-        default: '1.56.0.1'
-      rust_ver:
+        default: '1.57.0.0'
+      rust_version:
         description: 'Version of esp rust to use'
         required: true
-        default: '1.56.0'
+        default: '1.57.0'
 
 
 # We Break this down into individual jobs to avoid disk space issues

diff --git a/.github/workflows/build-rust-x86_64-pc-windows-msvc-dispatch.yaml b/.github/workflows/build-rust-x86_64-pc-windows-msvc-dispatch.yaml
@@ -7,14 +7,14 @@ on:
         description: 'Branch of rust-build to use'
         required: true
         default: 'main'
-      release_ver:
+      release_version:
         description: 'Release Version for generation'
         required: true
-        default: '1.56.0.1'
-      rust_ver:
+        default: '1.57.0.0'
+      rust_version:
         description: 'Version of esp rust to use'
         required: true
-        default: '1.56.0'
+        default: '1.57.0'
 
 
 # We Break this down into individual jobs to avoid disk space issues

diff --git a/.github/workflows/build-rust-x86_64-unknown-linux-gnu-dispatch.yaml b/.github/workflows/build-rust-x86_64-unknown-linux-gnu-dispatch.yaml
@@ -7,14 +7,14 @@ on:
         description: 'Branch of rust-build to use'
         required: true
         default: 'main'
-      release_ver:
+      release_version:
         description: 'Release Version for generation'
         required: true
-        default: '1.56.0.1'
-      rust_ver:
+        default: '1.57.0.0'
+      rust_version:
         description: 'Version of esp rust to use'
         required: true
-        default: '1.56.0'
+        default: '1.57.0'
 
 # We Break this down into individual jobs to avoid disk space issues
 jobs:

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.56.0.1'
+        default: '1.57.0.0'
       target:
         description: 'Target to build (e.g. xtensa-esp32-espidf)'
         required: true
@@ -50,8 +50,8 @@ jobs:
         include:
         - os: macos-m1-self-hosted
           ARCH: ''
-          ASSET_PATH: 'build/dist/rust-1.56.0-dev-aarch64-apple-darwin.tar.xz'
-          ASSET_NAME: 'rust-1.56.0-dev-aarch64-apple-darwin.tar.xz'
+          ASSET_PATH: 'build/dist/rust-1.57.0-dev-aarch64-apple-darwin.tar.xz'
+          ASSET_NAME: 'rust-1.57.0.0-aarch64-apple-darwin.tar.xz'
           ASSET_CONTENT_TYPE: 'application/x-tar'
           LLVM_ROOT_OPTION: ''
     steps:

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.56.0.1'
+        default: '1.57.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.56.0.1'
+        default: '1.57.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.56.0-dev-x86_64-pc-windows-msvc.zip'
+          ASSET_NAME: 'rust-1.57.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.56.0.1'
+        default: '1.57.0.0'
 
 jobs:
   build-idf-rust-examples:

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

diff --git a/README.md b/README.md
@@ -38,8 +38,8 @@ Export variables displayed at the end of the script.
 Installation of different version of toolchain:
 
 ```
-./install-rust-toolchain.sh --toolchain-version 1.56.0.1 --export-file export-1.56.0.1.sh
-source ./export-1.56.0.1.sh
+./install-rust-toolchain.sh --toolchain-version 1.57.0.0 --export-file export-esp-rust.sh
+source ./export-esp-rust.sh
 ```
 
 #### Get source code of examples
@@ -99,8 +99,8 @@ Export variables displayed at the end of the output from the script.
 Installation of different version of toolchain:
 
 ```
-./Install-RustToolchain.sh --toolchain-version 1.56.0.1 --export-file Export-1.56.0.1.ps1
-source ./Export-1.56.0.1.ps1
+./Install-RustToolchain.sh --toolchain-version 1.57.0.0 --export-file Export-EspRust.ps1
+source ./Export-EspRust.ps1
 ```
 
 #### Get source code of examples

diff --git a/Test-RustToolchain.ps1 b/Test-RustToolchain.ps1
@@ -2,7 +2,7 @@
 param (
     [Parameter()]
     [String]
-    $ToolchainVersion = '1.56.0.1',
+    $ToolchainVersion = '1.57.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 @@
 #!/bin/bash
 
 # Default values
-TOOLCHAIN_VERSION="1.56.0.1"
+TOOLCHAIN_VERSION="1.57.0.0"
 if [ -z "${RUSTUP_HOME}" ]; then
     RUSTUP_HOME="${HOME}/.rustup"
 fi