ci: change order of std/rusc add jemalloc

esp-rs · Dec 6, 2021 · 1f11a92 · 1f11a92
1 parent ca5351d
commit 1f11a92
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 7 deletions.
diff --git a/.github/actions/build/build-rust-std/action.yaml b/.github/actions/build/build-rust-std/action.yaml
@@ -30,7 +30,13 @@ runs:
     # Run Linux builds using bash
 
     - name: Prepare build
-      if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
+      if: startsWith(matrix.os, 'macos')
+      working-directory: ${{ env.work_dir }}
+      shell: bash
+      run: python3 src/bootstrap/configure.py ${{ matrix.llvm_root_option }} --experimental-targets=Xtensa --enable-extended --dist-compression-formats='xz' --set rust.jemalloc
+
+    - name: Prepare build
+      if: startsWith(matrix.os, 'ubuntu')
       working-directory: ${{ env.work_dir }}
       shell: bash
       run: python3 src/bootstrap/configure.py ${{ matrix.llvm_root_option }} --experimental-targets=Xtensa --enable-extended --dist-compression-formats='xz'

diff --git a/.github/actions/build/build-rustc/action.yaml b/.github/actions/build/build-rustc/action.yaml
@@ -30,7 +30,13 @@ runs:
     # Run Linux builds using bash
 
     - name: Prepare build
-      if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
+      if: startsWith(matrix.os, 'macos')
+      working-directory: ${{ env.work_dir }}
+      shell: bash
+      run: python3 src/bootstrap/configure.py ${{ matrix.llvm_root_option }} --experimental-targets=Xtensa --enable-extended --dist-compression-formats='xz' --set rust.jemalloc
+
+    - name: Prepare build
+      if: startsWith(matrix.os, 'ubuntu')
       working-directory: ${{ env.work_dir }}
       shell: bash
       run: python3 src/bootstrap/configure.py ${{ matrix.llvm_root_option }} --experimental-targets=Xtensa --enable-extended --dist-compression-formats='xz'

diff --git a/.github/actions/build/build-src/action.yaml b/.github/actions/build/build-src/action.yaml
@@ -22,8 +22,14 @@ runs:
 
     # Run Linux builds using bash
 
+    - name: Prepare build - macOS
+      if: startsWith(matrix.os, 'macos')
+      working-directory: ${{ env.work_dir }}
+      shell: bash
+      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
+
     - name: Prepare build - Unix
-      if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
+      if: startsWith(matrix.os, 'ubuntu')
       working-directory: ${{ env.work_dir }}
       shell: bash
       run: python3 src/bootstrap/configure.py ${{ matrix.llvm_root_option }} --experimental-targets=Xtensa --enable-extended --tools=clippy,cargo,rustfmt --dist-compression-formats='xz'

diff --git a/.github/actions/build/build-tools/action.yaml b/.github/actions/build/build-tools/action.yaml
@@ -32,7 +32,13 @@ runs:
     # Run Linux builds using bash
 
     - name: Prepare build
-      if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
+      if: startsWith(matrix.os, 'macos')
+      working-directory: ${{ env.work_dir }}
+      shell: bash
+      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
+
+    - name: Prepare build
+      if: startsWith(matrix.os, 'ubuntu')
       working-directory: ${{ env.work_dir }}
       shell: bash
       run: python3 src/bootstrap/configure.py ${{ matrix.llvm_root_option }} --experimental-targets=Xtensa --enable-extended --tools=clippy,cargo,rustfmt --dist-compression-formats='xz'

diff --git a/.github/workflows/build-rust-aarch64-apple-darwin-dispatch.yaml b/.github/workflows/build-rust-aarch64-apple-darwin-dispatch.yaml
@@ -60,7 +60,7 @@ jobs:
         if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-18.04' || matrix.os == 'windows-latest' }}
         uses: seanmiddleditch/gha-setup-ninja@master
       - name: Prepare build
-        run: python3 src/bootstrap/configure.py ${{ matrix.LLVM_ROOT_OPTION }} --experimental-targets=Xtensa --enable-extended --tools=clippy,cargo,rustfmt --dist-compression-formats='xz'
+        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
       - name: Build with x.py - dist packages
         if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-18.04' }}
         run: python3 x.py dist --stage 2

diff --git a/.github/workflows/build-rust-x86_64-unknown-linux-gnu-dispatch.yaml b/.github/workflows/build-rust-x86_64-unknown-linux-gnu-dispatch.yaml
@@ -10,7 +10,7 @@ on:
       release_version:
         description: 'Release Version for generation'
         required: true
-        default: '1.57.0.0'
+        default: '1.57.0.2'
       rust_version:
         description: 'Version of esp rust to use'
         required: true
@@ -44,8 +44,8 @@ jobs:
       - uses: ./rust-build/.github/actions/tools/setup-ninja
       - uses: ./rust-build/.github/actions/util/checkout-esp-rust
       - uses: ./rust-build/.github/actions/util/symlink-working-dir
-      - uses: ./rust-build/.github/actions/build/build-rustc
       - uses: ./rust-build/.github/actions/build/build-rust-std
+      - uses: ./rust-build/.github/actions/build/build-rustc
 
 
   build-tools: