Skip to content

Commit 59dc86a

Browse files
MabezDevMabezDev
authored
Merge pull request #305 from esp-rs/build/1.92.0.0
build 1.92.0.0
2 parents ff991a2 + e376fb3 commit 59dc86a

File tree

11 files changed

+59
-28
lines changed

11 files changed

+59
-28
lines changed

‎.github/workflows/build-aarch64-apple-darwin.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ on:
66
release_version:
77
description: "Xtensa Rust release version to build"
88
required: true
9-
default: '1.90.0.0'
9+
default: '1.92.0.0'
1010
release_tag:
11-
description: "Release tag where artifacts will be stored (e.g. v1.90.0.0, untagged-00000)"
11+
description: "Release tag where artifacts will be stored (e.g. v1.92.0.0, untagged-00000)"
1212
required: true
13-
default: "v1.90.0.0"
13+
default: "v1.92.0.0"
1414

1515
jobs:
1616
get_release:
@@ -54,7 +54,7 @@ jobs:
5454
submodules: true
5555
- name: Prepare build
5656
run: |
57-
arch -arm64 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,src --dist-compression-formats='xz' --set rust.jemalloc --enable-lld
57+
arch -arm64 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=rustdoc,clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --set rust.jemalloc --enable-lld
5858
- name: Build with x.py - dist packages - with cached LLVM
5959
run: arch -arm64 python3 x.py dist --stage 2 || echo "silence pkg build error"
6060
- name: Upload Release Asset

‎.github/workflows/build-aarch64-unknown-linux-gnu.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ on:
66
release_version:
77
description: "Xtensa Rust release version to build"
88
required: true
9-
default: '1.90.0.0'
9+
default: '1.92.0.0'
1010
release_tag:
11-
description: "Release tag where artifacts will be stored (e.g. v1.90.0.0, untagged-00000)"
11+
description: "Release tag where artifacts will be stored (e.g. v1.92.0.0, untagged-00000)"
1212
required: true
13-
default: "v1.90.0.0"
13+
default: "v1.92.0.0"
1414

1515
jobs:
1616
get_release:

‎.github/workflows/build-rust-src.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ on:
66
release_version:
77
description: "Xtensa Rust release version to build"
88
required: true
9-
default: '1.90.0.0'
9+
default: '1.92.0.0'
1010
release_tag:
11-
description: "Release tag where artifacts will be stored (e.g. v1.90.0.0, untagged-00000)"
11+
description: "Release tag where artifacts will be stored (e.g. v1.92.0.0, untagged-00000)"
1212
required: true
13-
default: "v1.90.0.0"
13+
default: "v1.92.0.0"
1414

1515
jobs:
1616
get_release:

‎.github/workflows/build-x86_64-pc-windows-msvc.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ on:
66
release_version:
77
description: "Xtensa Rust release version to build"
88
required: true
9-
default: '1.90.0.0'
9+
default: '1.92.0.0'
1010
release_tag:
11-
description: "Release tag where artifacts will be stored (e.g. v1.90.0.0, untagged-00000)"
11+
description: "Release tag where artifacts will be stored (e.g. v1.92.0.0, untagged-00000)"
1212
required: true
13-
default: "v1.90.0.0"
13+
default: "v1.92.0.0"
1414

1515
jobs:
1616
get_release:
@@ -59,7 +59,7 @@ jobs:
5959
working-directory: "R:"
6060
shell: powershell
6161
run: |
62-
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,analysis,rust-analysis,src --dist-compression-formats='xz' --enable-lld
62+
python src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${{ github.event.inputs.release_version }}" --enable-extended --tools=rustdoc,clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,analysis,rust-analysis,src --dist-compression-formats='xz' --enable-lld
6363
- name: Build with x.py - dist packages
6464
working-directory: "R:"
6565
continue-on-error: true

‎.github/workflows/build-x86_64-unknown-linux-gnu.yaml‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ on:
55
release_version:
66
description: "Xtensa Rust release version to build"
77
required: true
8-
default: "1.90.0.0"
8+
default: "1.92.0.0"
99
release_tag:
10-
description: "Release tag where artifacts will be stored (e.g. v1.90.0.0, untagged-00000)"
10+
description: "Release tag where artifacts will be stored (e.g. v1.92.0.0, untagged-00000)"
1111
required: true
12-
default: "v1.90.0.0"
12+
default: "v1.92.0.0"
1313

1414
jobs:
1515
get_release:
@@ -38,15 +38,26 @@ jobs:
3838
runs-on: ${{ matrix.os }}
3939
strategy:
4040
matrix:
41-
os: [linux-x86_64-self-hosted]
41+
os: [macos-m1-self-hosted]
4242
include:
43-
- os: linux-x86_64-self-hosted
43+
- os: macos-m1-self-hosted
4444
ASSET_PATH: "build/dist/rust-nightly-x86_64-unknown-linux-gnu.tar.xz"
4545
ASSET_NAME: "rust-${{ github.event.inputs.release_version }}-x86_64-unknown-linux-gnu.tar.xz"
4646
ASSET_CONTENT_TYPE: "application/x-tar"
4747
steps:
48-
- name: Initialize Docker
48+
- name: Initialize docker
4949
run: |
50+
if ! launchctl list | grep -q com.docker.docker; then
51+
echo "Starting Docker..."
52+
open --background -a Docker
53+
# Wait for Docker to start
54+
while ! docker system info > /dev/null 2>&1; do
55+
echo "Waiting for Docker to start..."
56+
sleep 10
57+
done
58+
else
59+
echo "Docker is already running."
60+
fi
5061
docker container rm rust-linux || echo "Container name rust-linux is available"
5162
- name: Checkout repository
5263
uses: actions/checkout@v6

‎.github/workflows/prepare-release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
next_release:
77
description: "Next Xtensa Rust release version"
88
required: true
9-
default: "v1.90.0.0"
9+
default: "v1.92.0.0"
1010
env:
1111
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1212

‎.github/workflows/publish-idf-rust-tags.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
toolchain-version:
77
description: "Version of Rust toolchain"
88
required: true
9-
default: "1.90.0.0"
9+
default: "1.92.0.0"
1010
publish:
1111
description: "Publish the tags to Dockehub?"
1212
required: true

‎support/rust-build/Repackage-RustRelease.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ param (
1111
$ErrorActionPreference = "Stop"
1212

1313
$RustVersion="nightly"
14-
$ReleaseVersion="1.90.0.0"
14+
$ReleaseVersion="1.92.0.0"
1515

1616
if (Test-Path -Path esp -PathType Container) {
1717
Remove-Item -Recurse -Force -Path esp

‎support/rust-build/aarch64-unknown-linux-gnu/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ set -e
44

55
git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git -b "esp-${RELEASE_VERSION}"
66
cd rust
7-
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
7+
python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=rustdoc,clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld
88
python3 x.py dist --stage 2

‎support/rust-build/x86_64-unknown-linux-gnu/Containerfile‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,26 @@ FROM ubuntu:22.04
33
ENV DEBIAN_FRONTEND=noninteractive
44
ENV LC_ALL=C.UTF-8
55
ENV LANG=C.UTF-8
6-
RUN apt-get update \
7-
&& apt-get install -y vim nano git curl gcc ninja-build cmake libudev-dev python3 python3-pip libusb-1.0-0 libssl-dev \
8-
pkg-config libtinfo5
6+
7+
# The following block of commands are order sensitive!
8+
# update _must_ come before adding declaring to dpkg we want amd64 packages else it fails
9+
# we update before and after adding the arch to ensure we have the latest package lists
10+
# this block ensures x86 dependencies are there for rosetta to use during various build steps
11+
RUN apt-get update
12+
RUN echo '\
13+
deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse\n\
14+
deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse\n\
15+
deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse\n\
16+
deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse\n\
17+
' >> /etc/apt/sources.list
18+
RUN apt-get update --fix-missing
19+
RUN dpkg --add-architecture amd64
20+
RUN apt-get install libc6:amd64 libstdc++6:amd64 -y
21+
22+
RUN apt-get install -y vim nano git curl gcc ninja-build cmake libudev-dev python3 python3-pip libusb-1.0-0 libssl-dev \
23+
pkg-config libtinfo5 \
24+
gcc-x86-64-linux-gnu \
25+
g++-x86-64-linux-gnu
926

1027
RUN adduser --disabled-password --gecos "" rust
1128
USER rust

0 commit comments

Comments
 (0)