Skip to content

Commit

Permalink
build release 1.72.0.0 (#231)
Browse files Browse the repository at this point in the history
* ci: bump up version to 1.72.0.0
* docs: Update readme to include 'espup install' (#230)

---------

Co-authored-by: Scott Moeller <[email protected]>
  • Loading branch information
georgik and electronjoe authored Aug 30, 2023
1 parent ff1e939 commit df8de6e
Show file tree
Hide file tree
Showing 21 changed files with 43 additions and 42 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
rust_build_branch:
description: "Branch of rust-build to use"
required: true
default: "build/1.71.0.1"
default: "build/1.72.0.0"
release_version:
description: "Release Version for generation"
required: true
default: '1.71.0.1'
default: '1.72.0.0'
rust_version:
description: "Version of esp rust to use"
required: true
Expand All @@ -24,7 +24,7 @@ on:
required: true
default: "aarch64-apple-darwin"
release_tag:
description: "Tag used for uploading (e.g. v1.71.0.1, untagged-00000)"
description: "Tag used for uploading (e.g. v1.72.0.0, untagged-00000)"
required: true
default: "untagged-06704172812884cde852"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
rust_build_branch:
description: "Branch of rust-build to use"
required: true
default: "build/1.71.0.1"
default: "build/1.72.0.0"
release_version:
description: "Release Version for generation"
required: true
default: '1.71.0.1'
default: '1.72.0.0'
rust_version:
description: "Version of esp rust to use"
required: true
Expand All @@ -24,7 +24,7 @@ on:
required: true
default: "aarch64-unknown-linux-gnu"
release_tag:
description: "Tag used for uploading (e.g. v1.71.0.1, untagged-00000)"
description: "Tag used for uploading (e.g. v1.72.0.0, untagged-00000)"
required: true
default: "untagged-06704172812884cde852"

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-rust-all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ on:
rust_build_branch:
description: "Branch of rust-build to use"
required: true
default: "build/1.71.0.1"
default: "build/1.72.0.0"
release_version:
description: "Release Version for generation"
required: true
default: '1.71.0.1'
default: '1.72.0.0'
rust_version:
description: "Version of esp rust to use"
required: true
default: "nightly"
release_tag:
description: "Tag used for uploading (e.g. v1.71.0.1, untagged-00000)"
description: "Tag used for uploading (e.g. v1.72.0.0, untagged-00000)"
required: true
default: "untagged-06704172812884cde852"

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-rust-src-dispatch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ on:
rust_build_branch:
description: "Branch of rust-build to use"
required: true
default: "build/1.71.0.1"
default: "build/1.72.0.0"
release_version:
description: "Release Version for generation"
required: true
default: '1.71.0.1'
default: '1.72.0.0'
rust_version:
description: "Version of esp rust to use"
required: true
default: "nightly"
release_tag:
description: "Tag used for uploading (e.g. v1.71.0.1, untagged-00000)"
description: "Tag used for uploading (e.g. v1.72.0.0, untagged-00000)"
required: true
default: "untagged-06704172812884cde852"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
rust_build_branch:
description: "Branch of rust-build to use"
required: true
default: "build/1.71.0.1"
default: "build/1.72.0.0"
release_version:
description: "Release Version for generation"
required: true
default: '1.71.0.1'
default: '1.72.0.0'
rust_version:
description: "Version of esp rust to use"
required: true
Expand All @@ -24,7 +24,7 @@ on:
required: true
default: "x86_64-apple-darwin"
release_tag:
description: "Tag used for uploading (e.g. v1.71.0.1, untagged-00000)"
description: "Tag used for uploading (e.g. v1.72.0.0, untagged-00000)"
required: true
default: "untagged-06704172812884cde852"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
rust_build_branch:
description: "Branch of rust-build to use"
required: true
default: "build/1.71.0.1"
default: "build/1.72.0.0"
release_version:
description: "Release Version for generation"
required: true
default: '1.71.0.1'
default: '1.72.0.0'
rust_version:
description: "Version of esp rust to use"
required: true
Expand All @@ -28,7 +28,7 @@ on:
required: true
default: "no"
release_tag:
description: "Tag used for uploading (e.g. v1.71.0.1, untagged-00000)"
description: "Tag used for uploading (e.g. v1.72.0.0, untagged-00000)"
required: true
default: "untagged-06704172812884cde852"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
rust_build_branch:
description: "Branch of rust-build to use"
required: true
default: "build/1.71.0.1"
default: "build/1.72.0.0"
release_version:
description: "Release Version for generation"
required: true
default: '1.71.0.1'
default: '1.72.0.0'
rust_version:
description: "Version of esp rust to use"
required: true
Expand All @@ -24,7 +24,7 @@ on:
required: true
default: "x86_64-pc-windows-msvc"
release_tag:
description: "Tag used for uploading (e.g. v1.71.0.1, untagged-00000)"
description: "Tag used for uploading (e.g. v1.72.0.0, untagged-00000)"
required: true
default: "untagged-06704172812884cde852"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
rust_build_branch:
description: "Branch of rust-build to use"
required: true
default: "build/1.71.0.1"
default: "build/1.72.0.0"
release_version:
description: "Release Version for generation"
required: true
default: "1.71.0.1"
default: "1.72.0.0"
rust_version:
description: "Version of esp rust to use"
required: true
Expand All @@ -24,7 +24,7 @@ on:
required: true
default: "x86_64-unknown-linux-gnu"
release_tag:
description: "Tag used for uploading (e.g. v1.71.0.1, untagged-00000)"
description: "Tag used for uploading (e.g. v1.72.0.0, untagged-00000)"
required: true
default: "untagged-06704172812884cde852"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/create-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ on:
workflow_dispatch:
inputs:
tag_name:
description: "Tag for draft release (e.g. v1.71.0.1)"
description: "Tag for draft release (e.g. v1.72.0.0)"
required: true
default: "v1.71.0.1"
default: "v1.72.0.0"

jobs:
create_release:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/installer-check.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Test installer by building template projects

env:
xtensa-toolchain-version: "1.71.0.1"
xtensa-toolchain-version: "1.72.0.0"

on:
push:
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.71.0.1"
default: "1.72.0.0"
rust_patch_version:
description: "Release patch version for generation - 3 places for tag"
required: true
default: "1.71.0"
default: "1.72.0"
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 @@ -6,7 +6,7 @@ on:
toolchain-version:
description: "Version of Rust toolchain"
required: true
default: "1.71.0.1"
default: "1.72.0.0"
publish:
description: "Publish the tags to Dockehub?"
required: true
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.71.0.1"
default: "1.72.0.0"
rust_version:
description: "Version of esp rust to use"
required: true
default: "1.71.0"
default: "1.72.0"

# We Break this down into individual jobs to avoid disk space issues
jobs:
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.71.0.1"
default: "1.72.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.71.0.1"
default: "1.72.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.71.0.1"
default: "1.72.0.0"
esp_idf_version:
description: "Version of ESP-IDF for the build"
required: true
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Deployment is done using [`espup`](https://github.com/esp-rs/espup#installation)
## `espup` installation
```sh
cargo install espup
espup install # To install Espressif Rust ecosystem
# [Unix]: Source the following file in every terminal before building a project
. $HOME/export-esp.sh
```
Expand Down Expand Up @@ -96,7 +97,7 @@ Or, downloading the pre-compiled release binaries:
**Deprecated method**

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

Expand Down Expand Up @@ -131,7 +132,7 @@ Run `./install-rust-toolchain.sh --help` for more information about arguments.
Installation of different version of the toolchain:

```
./install-rust-toolchain.sh --toolchain-version 1.71.0.1
./install-rust-toolchain.sh --toolchain-version 1.72.0.0
. ./export-esp.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.71.0.1"
TOOLCHAIN_VERSION="1.72.0.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 @@ -11,7 +11,7 @@ param (
$ErrorActionPreference = "Stop"

$RustVersion="nightly"
$ReleaseVersion="1.71.0.1"
$ReleaseVersion="1.72.0.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.71.0-dev*; do
NEW_NAME=`echo $I | sed -e 's/1.71.0-dev/1.71.0.1/g'`
for I in *1.72.0-dev*; do
NEW_NAME=`echo $I | sed -e 's/1.72.0-dev/1.72.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.71.0.1"
TOOLCHAIN_VERSION="1.72.0.0"
if [ -z "${RUSTUP_HOME}" ]; then
RUSTUP_HOME="${HOME}/.rustup"
fi
Expand Down

0 comments on commit df8de6e

Please sign in to comment.