Skip to content

Commit

Permalink
ci: update version to 1.62.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
georgik committed Jul 19, 2022
1 parent 7811212 commit 8427b1a
Show file tree
Hide file tree
Showing 23 changed files with 31 additions and 31 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
release_version:
description: 'Release Version for generation'
required: true
default: '1.62.0.0'
default: '1.62.1.0'
rust_version:
description: 'Version of esp rust to use'
required: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
release_version:
description: 'Release Version for generation'
required: true
default: '1.62.0.0'
default: '1.62.1.0'
rust_version:
description: 'Version of esp rust to use'
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-rust-src-dispatch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
release_version:
description: 'Release Version for generation'
required: true
default: '1.62.0.0'
default: '1.62.1.0'
rust_version:
description: 'Version of esp rust to use'
required: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
release_version:
description: 'Release Version for generation'
required: true
default: '1.62.0.0'
default: '1.62.1.0'
rust_version:
description: 'Version of esp rust to use'
required: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
release_version:
description: 'Release Version for generation'
required: true
default: '1.62.0.0'
default: '1.62.1.0'
rust_version:
description: 'Version of esp rust to use'
required: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
release_version:
description: 'Release Version for generation'
required: true
default: '1.62.0.0'
default: '1.62.1.0'
rust_version:
description: 'Version of esp rust to use'
required: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-idf-rust-examples-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
release_version:
description: 'Release version - long 4 places for tag'
required: true
default: '1.62.0.0'
default: '1.62.1.0'
rust_patch_version:
description: 'Release patch version for generation - 3 places for tag'
required: true
default: '1.62.0'
default: '1.62.1'
rust_minor_version:
description: 'Release minor version - 2 places for tag'
required: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-idf-rust-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
release_version:
description: 'Release version - long 4 places for tag'
required: true
default: '1.62.0.0'
default: '1.62.1.0'
rust_patch_version:
description: 'Release patch version for generation - 3 places for tag'
required: true
default: '1.62.0'
default: '1.62.1'
rust_minor_version:
description: 'Release minor version - 2 places for tag'
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-idf-rust-tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
toolchain-version:
description: 'Version of Rust toolchain'
required: true
default: '1.62.0.0'
default: '1.62.1.0'

jobs:
release-v4_4:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-installer-dispatch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
release_version:
description: 'Release Version for generation'
required: true
default: '1.62.0.0'
default: '1.62.1.0'
rust_version:
description: 'Version of esp rust to use'
required: true
default: '1.62.0'
default: '1.62.1'


# We Break this down into individual jobs to avoid disk space issues
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
toolchain_version:
description: 'Version of Rust IDF toolchain'
required: true
default: '1.62.0.0'
default: '1.62.1.0'
target:
description: 'Target to build (e.g. xtensa-esp32-espidf)'
required: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
toolchain_version:
description: 'Version of Rust IDF toolchain'
required: true
default: '1.62.0.0'
default: '1.62.1.0'

jobs:
build-idf-rust-examples:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
toolchain_version:
description: 'Version of Rust IDF toolchain'
required: true
default: '1.62.0.0'
default: '1.62.1.0'

jobs:
build-idf-rust-examples:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
ARCH: ''
TARGET: win-x64
ASSET_PATH: 'build/dist/esp.zip'
ASSET_NAME: 'rust-1.62.0.0-x86_64-pc-windows-msvc.zip'
ASSET_NAME: 'rust-1.62.1.0-x86_64-pc-windows-msvc.zip'
ASSET_CONTENT_TYPE: 'application/zip'
LLVM_ROOT_OPTION: '--llvm-root=C:/llvm-project'
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
toolchain_version:
description: 'Version of Rust IDF toolchain'
required: true
default: '1.62.0.0'
default: '1.62.1.0'
esp_idf_version:
description: 'Version of ESP-IDF for the build'
required: true
Expand Down
2 changes: 1 addition & 1 deletion Install-RustToolchain.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ param (
[String]
$ExportFile = '',
[String]
$ToolchainVersion = '1.62.0.0',
$ToolchainVersion = '1.62.1.0',
[String]
$ToolchainDestination = "${HOME}/.rustup/toolchains/esp",
[String]
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,21 @@ This repository contains:

## Xtensa Installation

Download installer from Release section: [https://github.com/esp-rs/rust-build/releases/tag/v1.62.0.0]
Download installer from Release section: [https://github.com/esp-rs/rust-build/releases/tag/v1.62.1.0]

### Download installer

#### Download installer in Bash

```bash
curl -LO https://github.com/esp-rs/rust-build/releases/download/v1.62.0.0/install-rust-toolchain.sh
curl -LO https://github.com/esp-rs/rust-build/releases/download/v1.62.1.0/install-rust-toolchain.sh
chmod a+x install-rust-toolchain.sh
```

#### Download installer in PowerShell

```powershell
Invoke-WebRequest 'https://github.com/esp-rs/rust-build/releases/download/v1.62.0.0/Install-RustToolchain.ps1' -OutFile .\Install-RustToolchain.ps1
Invoke-WebRequest 'https://github.com/esp-rs/rust-build/releases/download/v1.62.1.0/Install-RustToolchain.ps1' -OutFile .\Install-RustToolchain.ps1
```

### Linux and macOS
Expand Down Expand Up @@ -80,7 +80,7 @@ Export variables are displayed at the end of the script.
Installation of different version of toolchain:

```
./install-rust-toolchain.sh --toolchain-version 1.62.0.0 --export-file export-esp-rust.sh
./install-rust-toolchain.sh --toolchain-version 1.62.1.0 --export-file export-esp-rust.sh
source export-esp-rust.sh
```
Expand Down Expand Up @@ -131,7 +131,7 @@ Export variables are displayed at the end of the output from the script.
Installation of different version of toolchain:

```sh
./Install-RustToolchain.ps1 --toolchain-version 1.62.0.0 --export-file Export-EspRust.ps1
./Install-RustToolchain.ps1 --toolchain-version 1.62.1.0 --export-file Export-EspRust.ps1
source ./Export-EspRust.ps1
```

Expand Down
2 changes: 1 addition & 1 deletion Test-RustToolchain.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
param (
[Parameter()]
[String]
$ToolchainVersion = '1.62.0.0',
$ToolchainVersion = '1.62.1.0',
[String]
[ValidateSet("xtensa-esp32-espidf", "xtensa-esp32s2-espidf", "xtensa-esp32s3-espidf", "riscv32imc-esp-espidf")]
$Target = "xtensa-esp32-espidf",
Expand Down
2 changes: 1 addition & 1 deletion idf-rust.Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV LANG=C.UTF-8
ARG CONTAINER_USER=esp
ARG CONTAINER_GROUP=esp
ARG NIGHTLY_TOOLCHAIN_VERSION=nightly
ARG XTENSA_TOOLCHAIN_VERSION=1.62.0.0
ARG XTENSA_TOOLCHAIN_VERSION=1.62.1.0
ARG ESP_IDF_VERSION=""
ARG ESP_BOARD=esp32,esp32s2,esp32s3
ARG INSTALL_RUST_TOOLCHAIN=install-rust-toolchain.sh
Expand Down
2 changes: 1 addition & 1 deletion install-rust-toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -eu
#set -v

# Default values
TOOLCHAIN_VERSION="1.62.0.0"
TOOLCHAIN_VERSION="1.62.1.0"
RUSTUP_HOME="${RUSTUP_HOME:-${HOME}/.rustup}"
CARGO_HOME="${CARGO_HOME:-${HOME}/.cargo}"
TOOLCHAIN_DESTINATION_DIR="${RUSTUP_HOME}/toolchains/esp"
Expand Down
2 changes: 1 addition & 1 deletion support/rust-build/Repackage-RustRelease.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$ErrorActionPreference = "Stop"

$RustVersion="nightly"
$ReleaseVersion="1.62.0.0"
$ReleaseVersion="1.62.1.0"

if (Test-Path -Path esp -PathType Container) {
Remove-Item -Recurse -Force -Path esp
Expand Down
4 changes: 2 additions & 2 deletions support/rust-build/rename-rust-release.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

for I in *1.62.0-dev*; do
NEW_NAME=`echo $I | sed -e 's/1.62.0-dev/1.62.0.0/g'`
for I in *1.62.1-dev*; do
NEW_NAME=`echo $I | sed -e 's/1.62.1-dev/1.62.1.0/g'`
mv $I $NEW_NAME
done

2 changes: 1 addition & 1 deletion test-rust-toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

# Default values
TOOLCHAIN_VERSION="1.62.0.0"
TOOLCHAIN_VERSION="1.62.1.0"
if [ -z "${RUSTUP_HOME}" ]; then
RUSTUP_HOME="${HOME}/.rustup"
fi
Expand Down

0 comments on commit 8427b1a

Please sign in to comment.