Skip to content

Commit

Permalink
Build/1.74.0.1 (#249)
Browse files Browse the repository at this point in the history
* ci: bump up version to 1.74.0.1
* ci: remove self-hosted check
* ci: disable branch creation
  • Loading branch information
georgik authored Dec 7, 2023
1 parent afdbebd commit 6502160
Show file tree
Hide file tree
Showing 14 changed files with 45 additions and 55 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-aarch64-apple-darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ on:
release_version:
description: "Xtensa Rust release version to build"
required: true
default: '1.74.0.0'
default: '1.74.0.1'
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.74.0.1, untagged-00000)"
required: true
default: "untagged-3ecdd54e672f465cad2e"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-aarch64-unknown-linux-gnu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ on:
release_version:
description: "Xtensa Rust release version to build"
required: true
default: '1.74.0.0'
default: '1.74.0.1'
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.74.0.1, untagged-00000)"
required: true
default: "untagged-3ecdd54e672f465cad2e"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-rust-artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ on:
release_version:
description: "Xtensa Rust release version to build"
required: true
default: '1.74.0.0'
default: '1.74.0.1'
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.74.0.1, untagged-00000)"
required: true
default: "untagged-3ecdd54e672f465cad2e"
aarch64-apple-darwin:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-rust-src.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ on:
release_version:
description: "Xtensa Rust release version to build"
required: true
default: '1.74.0.0'
default: '1.74.0.1'
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.74.0.1, untagged-00000)"
required: true
default: "untagged-3ecdd54e672f465cad2e"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-x86_64-apple-darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ on:
release_version:
description: "Xtensa Rust release version to build"
required: true
default: '1.74.0.0'
default: '1.74.0.1'
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.74.0.1, untagged-00000)"
required: true
default: "untagged-3ecdd54e672f465cad2e"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-x86_64-pc-windows-gnu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ on:
release_version:
description: "Xtensa Rust release version to build"
required: true
default: '1.74.0.0'
default: '1.74.0.1'
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.74.0.1, untagged-00000)"
required: true
default: "untagged-3ecdd54e672f465cad2e"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-x86_64-pc-windows-msvc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ on:
release_version:
description: "Xtensa Rust release version to build"
required: true
default: '1.74.0.0'
default: '1.74.0.1'
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.74.0.1, untagged-00000)"
required: true
default: "untagged-3ecdd54e672f465cad2e"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-x86_64-unknown-linux-gnu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ on:
release_version:
description: "Xtensa Rust release version to build"
required: true
default: "1.74.0.0"
default: "1.74.0.1"
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.74.0.1, untagged-00000)"
required: true
default: "untagged-3ecdd54e672f465cad2e"

Expand Down
56 changes: 23 additions & 33 deletions .github/workflows/prepare-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,37 @@ on:
last_release:
description: "Previous Xtensa Rust release version"
required: true
default: '1.74.0.0'
default: '1.74.0.1'
next_release:
description: "Next Xtensa Rust release version"
required: true
default: "1.74.0.0"
default: "1.74.0.1"

jobs:
prepare-release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Replace Xtensa Rust versions
run: |
find . -type f -exec sed -i 's/${{ github.event.inputs.last_release }}/${{ github.event.inputs.next_release }}/g' {} \;
- name: Commit changes
uses: EndBug/add-and-commit@v9
with:
default_author: github_actions
add: '*'
message: 'Bump Xtensa Rust version to ${{ github.event.inputs.next_release }}'
new_branch: build/${{ github.event.inputs.next_release }}
- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
token: ${{ secrets.PAT }}
branch: build/${{ github.event.inputs.next_release }}
base: main
delete-branch: false
title: 'Update Xtensa Rust version to ${{ github.event.inputs.next_release }}'
body:
draft: false
# - uses: actions/checkout@v4
# - name: Replace Xtensa Rust versions
# run: |
# find . -type f -exec sed -i 's/${{ github.event.inputs.last_release }}/${{ github.event.inputs.next_release }}/g' {} \;
# - name: Commit changes
# uses: EndBug/add-and-commit@v9
# with:
# default_author: github_actions
# add: '*'
# message: 'Bump Xtensa Rust version to ${{ github.event.inputs.next_release }}'
# new_branch: build/${{ github.event.inputs.next_release }}
# - name: Create Pull Request
# uses: peter-evans/create-pull-request@v5
# with:
# token: ${{ secrets.PAT }}
# branch: build/${{ github.event.inputs.next_release }}
# base: main
# delete-branch: false
# title: 'Update Xtensa Rust version to ${{ github.event.inputs.next_release }}'
# body:
# draft: false
- name: Create Release
uses: actions/create-release@v1
env:
Expand All @@ -46,13 +46,3 @@ jobs:
release_name: Release ${{ github.event.inputs.next_release }}
draft: true
prerelease: true
check-selfhoste-builders:
name: Check builders
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ "macos-m1-self-hosted", "macos-x86_64-self-hosted", "x86_64-pc-windows-gnu-self-hosted", "windows-x86_64-self-hosted" ]
steps:
- name: Simple test
run: echo "Test"
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.74.0.0"
default: "1.74.0.1"
publish:
description: "Publish the tags to Dockehub?"
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upload-installer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
release_version:
description: "Release Version for generation"
required: true
default: "1.74.0.0"
default: "1.74.0.1"
rust_version:
description: "Version of esp rust to use"
required: true
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Or, downloading the pre-compiled release binaries:
**Deprecated method**

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

Expand Down Expand Up @@ -130,7 +130,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.74.0.0
./install-rust-toolchain.sh --toolchain-version 1.74.0.1
. ./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.74.0.0"
TOOLCHAIN_VERSION="1.74.0.1"
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.74.0.0"
$ReleaseVersion="1.74.0.1"

if (Test-Path -Path esp -PathType Container) {
Remove-Item -Recurse -Force -Path esp
Expand Down

0 comments on commit 6502160

Please sign in to comment.