Skip to content
Open
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
6 changes: 3 additions & 3 deletions .github/workflows/build-aarch64-apple-darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ on:
release_version:
description: "Xtensa Rust release version to build"
required: true
default: '1.90.0.0'
default: '1.91.1.0'
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.90.0.0, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.91.1.0, untagged-00000)"
required: true
default: "v1.90.0.0"
default: "v1.91.1.0"

jobs:
get_release:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-aarch64-unknown-linux-gnu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ on:
release_version:
description: "Xtensa Rust release version to build"
required: true
default: '1.90.0.0'
default: '1.91.1.0'
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.90.0.0, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.91.1.0, untagged-00000)"
required: true
default: "v1.90.0.0"
default: "v1.91.1.0"

jobs:
get_release:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-rust-src.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ on:
release_version:
description: "Xtensa Rust release version to build"
required: true
default: '1.90.0.0'
default: '1.91.1.0'
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.90.0.0, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.91.1.0, untagged-00000)"
required: true
default: "v1.90.0.0"
default: "v1.91.1.0"

jobs:
get_release:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-x86_64-pc-windows-msvc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ on:
release_version:
description: "Xtensa Rust release version to build"
required: true
default: '1.90.0.0'
default: '1.91.1.0'
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.90.0.0, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.91.1.0, untagged-00000)"
required: true
default: "v1.90.0.0"
default: "v1.91.1.0"

jobs:
get_release:
Expand Down
25 changes: 18 additions & 7 deletions .github/workflows/build-x86_64-unknown-linux-gnu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ on:
release_version:
description: "Xtensa Rust release version to build"
required: true
default: "1.90.0.0"
default: "1.91.1.0"
release_tag:
description: "Release tag where artifacts will be stored (e.g. v1.90.0.0, untagged-00000)"
description: "Release tag where artifacts will be stored (e.g. v1.91.1.0, untagged-00000)"
required: true
default: "v1.90.0.0"
default: "v1.91.1.0"

jobs:
get_release:
Expand Down Expand Up @@ -38,22 +38,33 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [linux-x86_64-self-hosted]
os: [macos-m1-self-hosted]
include:
- os: linux-x86_64-self-hosted
- os: macos-m1-self-hosted
ASSET_PATH: "build/dist/rust-nightly-x86_64-unknown-linux-gnu.tar.xz"
ASSET_NAME: "rust-${{ github.event.inputs.release_version }}-x86_64-unknown-linux-gnu.tar.xz"
ASSET_CONTENT_TYPE: "application/x-tar"
steps:
- name: Initialize Docker
- 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@v5
- name: Build construction container
run: |
cd support/rust-build/x86_64-unknown-linux-gnu
docker build -f Containerfile -t ubuntu-builder .
docker build -t ubuntu-builder -f Containerfile .
- name: Build Rust
run: |
docker run -e RELEASE_VERSION='${{ github.event.inputs.release_version }}' --name rust-linux ubuntu-builder ./build.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prepare-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
next_release:
description: "Next Xtensa Rust release version"
required: true
default: "v1.90.0.0"
default: "v1.91.1.0"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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.90.0.0"
default: "1.91.1.0"
publish:
description: "Publish the tags to Dockehub?"
required: true
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.90.0.0"
$ReleaseVersion="1.91.1.0"

if (Test-Path -Path esp -PathType Container) {
Remove-Item -Recurse -Force -Path esp
Expand Down
1 change: 1 addition & 0 deletions support/rust-build/aarch64-unknown-linux-gnu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ set -e
git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git -b "esp-${RELEASE_VERSION}"
cd rust
python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld

python3 x.py dist --stage 2
23 changes: 20 additions & 3 deletions support/rust-build/x86_64-unknown-linux-gnu/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,26 @@ FROM ubuntu:22.04
ENV DEBIAN_FRONTEND=noninteractive
ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8
RUN apt-get update \
&& apt-get install -y vim nano git curl gcc ninja-build cmake libudev-dev python3 python3-pip libusb-1.0-0 libssl-dev \
pkg-config libtinfo5

# The following block of commands are order sensitive!
# update _must_ come before adding declaring to dpkg we want amd64 packages else it fails
# we update before and after adding the arch to ensure we have the latest package lists
# this block ensures x86 dependencies are there for rosetta to use during various build steps
RUN apt-get update
RUN echo '\
deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse\n\
deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse\n\
deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse\n\
deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse\n\
' >> /etc/apt/sources.list
RUN apt-get update
RUN dpkg --add-architecture amd64
RUN apt-get install libc6:amd64 libstdc++6:amd64 -y

RUN apt-get install -y vim nano git curl gcc ninja-build cmake libudev-dev python3 python3-pip libusb-1.0-0 libssl-dev \
pkg-config libtinfo5 \
gcc-x86-64-linux-gnu \
g++-x86-64-linux-gnu

RUN adduser --disabled-password --gecos "" rust
USER rust
Expand Down
5 changes: 3 additions & 2 deletions support/rust-build/x86_64-unknown-linux-gnu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ set -e

git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git -b "esp-${RELEASE_VERSION}"
cd rust
python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld
python3 x.py dist --stage 2
python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --enable-extended --tools=rustdoc,clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --enable-lld --prefix $(pwd)/build/esp --sysconfdir $(pwd)/build/esp-etc --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu --build aarch64-unknown-linux-gnu --disable-docs

python3 x.py dist
Loading