Skip to content

Commit 1f11a92

Browse files
committed
ci: change order of std/rusc add jemalloc
1 parent ca5351d commit 1f11a92

File tree

6 files changed

+31
-7
lines changed

6 files changed

+31
-7
lines changed

.github/actions/build/build-rust-std/action.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,13 @@ runs:
3030
# Run Linux builds using bash
3131

3232
- name: Prepare build
33-
if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
33+
if: startsWith(matrix.os, 'macos')
34+
working-directory: ${{ env.work_dir }}
35+
shell: bash
36+
run: python3 src/bootstrap/configure.py ${{ matrix.llvm_root_option }} --experimental-targets=Xtensa --enable-extended --dist-compression-formats='xz' --set rust.jemalloc
37+
38+
- name: Prepare build
39+
if: startsWith(matrix.os, 'ubuntu')
3440
working-directory: ${{ env.work_dir }}
3541
shell: bash
3642
run: python3 src/bootstrap/configure.py ${{ matrix.llvm_root_option }} --experimental-targets=Xtensa --enable-extended --dist-compression-formats='xz'

.github/actions/build/build-rustc/action.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,13 @@ runs:
3030
# Run Linux builds using bash
3131

3232
- name: Prepare build
33-
if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
33+
if: startsWith(matrix.os, 'macos')
34+
working-directory: ${{ env.work_dir }}
35+
shell: bash
36+
run: python3 src/bootstrap/configure.py ${{ matrix.llvm_root_option }} --experimental-targets=Xtensa --enable-extended --dist-compression-formats='xz' --set rust.jemalloc
37+
38+
- name: Prepare build
39+
if: startsWith(matrix.os, 'ubuntu')
3440
working-directory: ${{ env.work_dir }}
3541
shell: bash
3642
run: python3 src/bootstrap/configure.py ${{ matrix.llvm_root_option }} --experimental-targets=Xtensa --enable-extended --dist-compression-formats='xz'

.github/actions/build/build-src/action.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,14 @@ runs:
2222

2323
# Run Linux builds using bash
2424

25+
- name: Prepare build - macOS
26+
if: startsWith(matrix.os, 'macos')
27+
working-directory: ${{ env.work_dir }}
28+
shell: bash
29+
run: python3 src/bootstrap/configure.py ${{ matrix.llvm_root_option }} --experimental-targets=Xtensa --enable-extended --tools=clippy,cargo,rustfmt --dist-compression-formats='xz' --set rust.jemalloc
30+
2531
- name: Prepare build - Unix
26-
if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
32+
if: startsWith(matrix.os, 'ubuntu')
2733
working-directory: ${{ env.work_dir }}
2834
shell: bash
2935
run: python3 src/bootstrap/configure.py ${{ matrix.llvm_root_option }} --experimental-targets=Xtensa --enable-extended --tools=clippy,cargo,rustfmt --dist-compression-formats='xz'

.github/actions/build/build-tools/action.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,13 @@ runs:
3232
# Run Linux builds using bash
3333

3434
- name: Prepare build
35-
if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
35+
if: startsWith(matrix.os, 'macos')
36+
working-directory: ${{ env.work_dir }}
37+
shell: bash
38+
run: python3 src/bootstrap/configure.py ${{ matrix.llvm_root_option }} --experimental-targets=Xtensa --enable-extended --tools=clippy,cargo,rustfmt --dist-compression-formats='xz' --set rust.jemalloc
39+
40+
- name: Prepare build
41+
if: startsWith(matrix.os, 'ubuntu')
3642
working-directory: ${{ env.work_dir }}
3743
shell: bash
3844
run: python3 src/bootstrap/configure.py ${{ matrix.llvm_root_option }} --experimental-targets=Xtensa --enable-extended --tools=clippy,cargo,rustfmt --dist-compression-formats='xz'

.github/workflows/build-rust-aarch64-apple-darwin-dispatch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-18.04' || matrix.os == 'windows-latest' }}
6161
uses: seanmiddleditch/gha-setup-ninja@master
6262
- name: Prepare build
63-
run: python3 src/bootstrap/configure.py ${{ matrix.LLVM_ROOT_OPTION }} --experimental-targets=Xtensa --enable-extended --tools=clippy,cargo,rustfmt --dist-compression-formats='xz'
63+
run: python3 src/bootstrap/configure.py ${{ matrix.LLVM_ROOT_OPTION }} --experimental-targets=Xtensa --enable-extended --tools=clippy,cargo,rustfmt --dist-compression-formats='xz' --set rust.jemalloc
6464
- name: Build with x.py - dist packages
6565
if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-18.04' }}
6666
run: python3 x.py dist --stage 2

.github/workflows/build-rust-x86_64-unknown-linux-gnu-dispatch.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
release_version:
1111
description: 'Release Version for generation'
1212
required: true
13-
default: '1.57.0.0'
13+
default: '1.57.0.2'
1414
rust_version:
1515
description: 'Version of esp rust to use'
1616
required: true
@@ -44,8 +44,8 @@ jobs:
4444
- uses: ./rust-build/.github/actions/tools/setup-ninja
4545
- uses: ./rust-build/.github/actions/util/checkout-esp-rust
4646
- uses: ./rust-build/.github/actions/util/symlink-working-dir
47-
- uses: ./rust-build/.github/actions/build/build-rustc
4847
- uses: ./rust-build/.github/actions/build/build-rust-std
48+
- uses: ./rust-build/.github/actions/build/build-rustc
4949

5050

5151
build-tools:

0 commit comments

Comments
 (0)