Build/1.58 (#32)

georgik · web-flow · commit 15d9d8a520d5 · 2022-02-02T07:12:58.000+01:00
* ci: build of 1.58.0.0
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.57.0-dev-aarch64-apple-darwin.tar.xz'
-          ASSET_NAME: 'rust-1.57.0.2-aarch64-apple-darwin.tar.xz'
+          ASSET_PATH: 'build/dist/rust-1.58.0-dev-aarch64-apple-darwin.tar.xz'
+          ASSET_NAME: 'rust-1.58.0.0-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.57.0.2
+          ref: esp-1.58.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-src-dispatch.yaml b/.github/workflows/build-rust-src-dispatch.yaml
@@ -10,11 +10,11 @@ on:
       release_version:
         description: 'Release Version for generation'
         required: true
-        default: '1.57.0.0'
+        default: '1.58.0.0'
       rust_version:
         description: 'Version of esp rust to use'
         required: true
-        default: '1.57.0'
+        default: '1.58.0'
 
 
 jobs:
diff --git a/.github/workflows/build-rust-x86_64-apple-darwin-dispatch.yaml b/.github/workflows/build-rust-x86_64-apple-darwin-dispatch.yaml
@@ -10,11 +10,11 @@ on:
       release_version:
         description: 'Release Version for generation'
         required: true
-        default: '1.57.0.2'
+        default: '1.58.0.0'
       rust_version:
         description: 'Version of esp rust to use'
         required: true
-        default: '1.57.0'
+        default: '1.58.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
@@ -10,11 +10,11 @@ on:
       release_version:
         description: 'Release Version for generation'
         required: true
-        default: '1.57.0.2'
+        default: '1.58.0.0'
       rust_version:
         description: 'Version of esp rust to use'
         required: true
-        default: '1.57.0'
+        default: '1.58.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
@@ -10,11 +10,11 @@ on:
       release_version:
         description: 'Release Version for generation'
         required: true
-        default: '1.57.0.2'
+        default: '1.58.0.0'
       rust_version:
         description: 'Version of esp rust to use'
         required: true
-        default: '1.57.0'
+        default: '1.58.0'
 
 # We Break this down into individual jobs to avoid disk space issues
 jobs:
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.57.0.2'
+        default: '1.58.0.0'
       rust_version:
         description: 'Version of esp rust to use'
         required: true
-        default: '1.57.0'
+        default: '1.58.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.57.0.2'
+        default: '1.58.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.57.0.2'
+        default: '1.58.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.57.0.2'
+        default: '1.58.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.57.0.2-x86_64-pc-windows-msvc.zip'
+          ASSET_NAME: 'rust-1.58.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.57.0.2'
+        default: '1.58.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.57.0.2',
+    $ToolchainVersion = '1.58.0.0',
     [String]
     $ToolchainDestination = "${HOME}/.rustup/toolchains/esp",
     [String]
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ Export variables displayed at the end of the script.
 Installation of different version of toolchain:
 
 ```
-./install-rust-toolchain.sh --toolchain-version 1.57.0.0 --export-file export-esp-rust.sh
+./install-rust-toolchain.sh --toolchain-version 1.58.0.0 --export-file export-esp-rust.sh
 source ./export-esp-rust.sh
 ```
 
@@ -100,7 +100,7 @@ Export variables displayed at the end of the output from the script.
 Installation of different version of toolchain:
 
 ```
-./Install-RustToolchain.sh --toolchain-version 1.57.0.0 --export-file Export-EspRust.ps1
+./Install-RustToolchain.sh --toolchain-version 1.58.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.57.0.2',
+    $ToolchainVersion = '1.58.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.57.0.2"
+TOOLCHAIN_VERSION="1.58.0.0"
 if [ -z "${RUSTUP_HOME}" ]; then
     RUSTUP_HOME="${HOME}/.rustup"
 fi
diff --git a/support/rust-build/Repackage-RustRelease.ps1 b/support/rust-build/Repackage-RustRelease.ps1
@@ -0,0 +1,35 @@
+# Helper script to perform repackaging of Windows release
+
+# Stop on error
+$ErrorActionPreference = "Stop"
+
+$RustVersion="1.58.0-dev"
+$ReleaseVersion="1.58.0.0"
+
+if (Test-Path -Path esp -PathType Container) {
+    Remove-Item -Recurse -Force -Path esp
+    rm *.tar
+}
+
+mkdir esp
+7z e rust-${RustVersion}-x86_64-pc-windows-msvc.tar.xz
+7z x rust-${RustVersion}-x86_64-pc-windows-msvc.tar
+pushd rust-${RustVersion}-x86_64-pc-windows-msvc
+cp -Recurse .\rustc\bin ..\esp\
+cp -Recurse .\rustc\lib ..\esp\
+cp -Recurse .\rustc\share ..\esp\
+cp -ErrorAction SilentlyContinue -Recurse .\rust-std-x86_64-pc-windows-msvc\lib\* ..\esp\lib\
+popd
+7z e rust-src-${RustVersion}.tar.xz
+7z x rust-src-${RustVersion}.tar
+pushd rust-src-${RustVersion}
+cp -ErrorAction SilentlyContinue -Recurse .\rust-src\lib\* ..\esp\lib\
+popd
+
+# Clean up debug files
+Get-ChildItem -Path .\ -Filter *.pdb -Recurse -File -Name| ForEach-Object {
+    "Removing: $_"
+    Remove-Item -Path $_
+}
+
+7z a rust-${ReleaseVersion}-x86_64-pc-windows-msvc.zip esp/
diff --git a/support/rust-build/rename-rust-release.sh b/support/rust-build/rename-rust-release.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-for I in *1.57.0-dev*; do
-     NEW_NAME=`echo $I | sed -e 's/1.57.0-dev/1.57.0.2/g'`
+for I in *1.58.0-dev*; do
+     NEW_NAME=`echo $I | sed -e 's/1.58.0-dev/1.58.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.57.0.2"
+TOOLCHAIN_VERSION="1.58.0.0"
 if [ -z "${RUSTUP_HOME}" ]; then
     RUSTUP_HOME="${HOME}/.rustup"
 fi
