Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.74.0.0 #248

Merged
merged 10 commits into from
Nov 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.73.0.1'
default: '1.74.0.0'
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.73.0.1, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)"
required: true
default: "untagged-3ecdd54e672f465cad2e"

Expand Down
17 changes: 14 additions & 3 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.73.0.1'
default: '1.74.0.0'
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.73.0.1, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)"
required: true
default: "untagged-3ecdd54e672f465cad2e"

Expand Down Expand Up @@ -48,6 +48,17 @@ jobs:
steps:
- name: Initialize docker
run: |
if ! launchctl list | grep -q com.docker.docker; then
echo "Starting Docker..."
open --background -a Docker
# Wait for Docker to start
while ! docker system info > /dev/null 2>&1; do
echo "Waiting for Docker to start..."
sleep 10
done
else
echo "Docker is already running."
fi
docker container rm rust-linux || echo "Container name rust-linux is available"
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -73,5 +84,5 @@ jobs:
- name: Clean up
run: |
docker container rm rust-linux
docker machine stop
#docker machine stop
rm -rf build
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.73.0.1'
default: '1.74.0.0'
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.73.0.1, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, 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.73.0.1'
default: '1.74.0.0'
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.73.0.1, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)"
required: true
default: "untagged-3ecdd54e672f465cad2e"

Expand Down
15 changes: 10 additions & 5 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.73.0.1'
default: '1.74.0.0'
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.73.0.1, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)"
required: true
default: "untagged-3ecdd54e672f465cad2e"

Expand Down Expand Up @@ -38,13 +38,16 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-x86_64-self-hosted]
os: [macos-latest]
#os: [macos-x86_64-self-hosted]
include:
- os: macos-x86_64-self-hosted
- os: macos-latest
ASSET_PATH: "build/dist/rust-nightly-x86_64-apple-darwin.tar.xz"
ASSET_NAME: "rust-${{ github.event.inputs.release_version }}-x86_64-apple-darwin.tar.xz"
ASSET_CONTENT_TYPE: "application/x-tar"
steps:
- name: Check architecture
run: uname -a
- name: Checkout repository
uses: actions/checkout@v4
with:
Expand All @@ -55,7 +58,9 @@ jobs:
run: |
python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${{ github.event.inputs.release_version }}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv --dist-compression-formats='xz' --set rust.jemalloc --enable-lld
- name: Build with x.py - dist packages
run: python3 x.py dist --stage 2 || echo "Ignoring pkg failure"
run: |
brew install ninja
python3 x.py dist --stage 2 || echo "Ignoring pkg failure"
- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
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.73.0.1'
default: '1.74.0.0'
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.73.0.1, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)"
required: true
default: "untagged-3ecdd54e672f465cad2e"

Expand Down
12 changes: 6 additions & 6 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.73.0.1'
default: '1.74.0.0'
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.73.0.1, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)"
required: true
default: "untagged-3ecdd54e672f465cad2e"

Expand Down Expand Up @@ -39,9 +39,9 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-x86_64-self-hosted]
os: [x86_64-pc-windows-msvc-self-hosted]
include:
- os: windows-x86_64-self-hosted
- os: x86_64-pc-windows-msvc-self-hosted
ASSET_PATH: "rust/build/dist/rust-nightly-x86_64-pc-windows-msvc.zip"
ASSET_NAME: "rust-${{ github.event.inputs.release_version }}-x86_64-pc-windows-msvc.zip"
ASSET_CONTENT_TYPE: "application/x-tar"
Expand All @@ -66,11 +66,11 @@ jobs:
- name: Prepare build
working-directory: "R:"
run: |
python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${{ github.event.inputs.release_version }}" --enable-extended --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv --dist-compression-formats='xz' --enable-lld
python src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${{ github.event.inputs.release_version }}" --enable-extended --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv --dist-compression-formats='xz' --enable-lld
- name: Build with x.py - dist packages
working-directory: "R:"
continue-on-error: true
run: python3 x.py dist --stage 2
run: python x.py dist --stage 2
- name: Repackage binary
shell: powershell
working-directory: "R:/build/dist"
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.73.0.1"
default: "1.74.0.0"
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.73.0.1, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.74.0.0, untagged-00000)"
required: true
default: "untagged-3ecdd54e672f465cad2e"

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

jobs:
prepare-release:
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.73.0.1"
default: "1.74.0.0"
publish:
description: "Publish the tags to Dockehub?"
required: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/upload-installer.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.73.0.0"
default: "1.74.0.0"
rust_version:
description: "Version of esp rust to use"
required: true
default: "1.73.0"
default: "1.74.0"

# We Break this down into individual jobs to avoid disk space issues
jobs:
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.73.0.1/install-rust-toolchain.sh
curl -LO https://github.com/esp-rs/rust-build/releases/download/v1.74.0.0/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.73.0.1
./install-rust-toolchain.sh --toolchain-version 1.74.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.73.0.1"
TOOLCHAIN_VERSION="1.74.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.73.0.1"
$ReleaseVersion="1.74.0.0"

if (Test-Path -Path esp -PathType Container) {
Remove-Item -Recurse -Force -Path esp
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Requires elevation of privileges

Set-ExecutionPolicy Bypass

winget install --id Git.Git --accept-source-agreements
winget install --id MSYS2.MSYS2
winget install --id 7zip.7zip
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Requires elevation of privileges
$ProgressPreference = 'SilentlyContinue'
Set-ExecutionPolicy Bypass

winget install --id Git.Git --accept-source-agreements
winget install --id 7zip.7zip
winget install --id Python.Python.3.12 --scope machine
winget install --id Kitware.CMake
winget install --id Ninja-build.Ninja

wget https://aka.ms/vs/17/release/vs_buildtools.exe -OutFile vs_buildtools.exe
.\vs_buildtools.exe --passive --wait --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows11SDK.22621

# winget installation failed with an error, using vs_buildtools.exe instead
#winget install -e --id Microsoft.WindowsSDK
#winget install Microsoft.VisualStudio.2022.BuildTools --silent --override "--wait --quiet --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64"

setx /M PATH "$env:PATH;C:\Program Files\7-Zip"
Loading