ci: just set required env globally

(backport <#3891>) (cherry picked from commit 7294016)
rust-lang · Nov 7, 2024 · 493be18 · 493be18
1 parent 164a8a4
commit 493be18
Showing 1 changed file with 33 additions and 8 deletions.
diff --git a/.github/workflows/full_ci.yml b/.github/workflows/full_ci.yml
@@ -6,12 +6,37 @@ on:
     branches:
       - libc-0.2
 
+env:
+  LIBC_CI: 1
+
 jobs:
   docker_linux_tier1:
     name: Docker Linux Tier1
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
+      max-parallel: 5
+      matrix:
+        toolchain:
+          - stable
+          - beta
+          - nightly
+          - 1.63.0
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Rust toolchain
+        run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
+      - name: Execute build.sh
+        run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
+
+  build_channels_macos:
+    name: Build Channels macOS
+    needs: macos
+    env:
+      OS: macos
+    strategy:
+      fail-fast: true
+      max-parallel: 4
       matrix:
         target:
           - i686-unknown-linux-gnu
@@ -21,7 +46,7 @@ jobs:
       - name: Setup Rust toolchain
         run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
       - name: Execute run-docker.sh
-        run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
+        run: sh ./ci/run-docker.sh ${{ matrix.target }}
 
   macos:
     name: macOS
@@ -36,7 +61,7 @@ jobs:
       - name: Setup Rust toolchain
         run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
       - name: Execute run.sh
-        run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
+        run: sh ./ci/run.sh ${{ matrix.target }}
 
   windows:
     name: Windows
@@ -66,7 +91,7 @@ jobs:
         run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
         shell: bash
       - name: Execute run.sh
-        run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
+        run: sh ./ci/run.sh ${{ matrix.target }}
         shell: bash
 
   style_check:
@@ -117,7 +142,7 @@ jobs:
       - name: Setup Rust toolchain
         run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
       - name: Execute run-docker.sh
-        run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
+        run: sh ./ci/run-docker.sh ${{ matrix.target }}
 
   build_channels_linux:
     name: Build Channels Linux
@@ -145,7 +170,7 @@ jobs:
       - name: Setup Rust toolchain
         run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
       - name: Execute build.sh
-        run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
+        run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
 
   build_channels_macos:
     name: Build Channels macOS
@@ -166,7 +191,7 @@ jobs:
       - name: Setup Rust toolchain
         run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/install-rust.sh
       - name: Execute build.sh
-        run: LIBC_CI=1 TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
+        run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
 
   build_channels_windows:
     name: Build Channels Windows
@@ -188,7 +213,7 @@ jobs:
         run: rustup self update
         shell: bash
       - name: Execute build.sh
-        run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
+        run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
         shell: bash
 
   check_cfg:
@@ -199,7 +224,7 @@ jobs:
       - name: Setup Rust toolchain
         run: TOOLCHAIN=nightly sh ./ci/install-rust.sh
       - name: Build with check-cfg
-        run: LIBC_CI=1 LIBC_CHECK_CFG=1 cargo build -Z unstable-options -Z check-cfg
+        run: LIBC_CHECK_CFG=1 cargo build -Z unstable-options -Z check-cfg
 
   # One job that "summarizes" the success state of this pipeline. This can then be added to branch
   # protection, rather than having to add each job separately.