Skip to content

Commit

Permalink
ci: bump up version to 1.58
Browse files Browse the repository at this point in the history
  • Loading branch information
georgik committed Jan 14, 2022
1 parent 6b71e69 commit 680eb45
Show file tree
Hide file tree
Showing 17 changed files with 26 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-rust-src-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.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:
Expand Down
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.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
Expand Down
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.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
Expand Down
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.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:
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.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
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.57.0.2'
default: '1.58.0.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.57.0.2'
default: '1.58.0.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.57.0.2'
default: '1.58.0.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.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:
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.57.0.2'
default: '1.58.0.0'

jobs:
build-idf-rust-examples:
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.57.0.2',
$ToolchainVersion = '1.58.0.0',
[String]
$ToolchainDestination = "${HOME}/.rustup/toolchains/esp",
[String]
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down Expand Up @@ -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
```

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.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",
Expand Down
2 changes: 1 addition & 1 deletion install-rust-toolchain.sh
Original file line number Diff line number Diff line change
@@ -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
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 @@
#!/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

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.57.0.2"
TOOLCHAIN_VERSION="1.58.0.0"
if [ -z "${RUSTUP_HOME}" ]; then
RUSTUP_HOME="${HOME}/.rustup"
fi
Expand Down

0 comments on commit 680eb45

Please sign in to comment.