Merge pull request rust-lang#4012 from tgross35/backport-ci-updates

[0.2] Backports

Author: tgross35

.github/workflows/full_ci.yml

@@ -6,84 +6,11 @@ on:
     branches:
       - libc-0.2
 
-jobs:
-  docker_linux_tier1:
-    permissions:
-      contents: read # to fetch code (actions/checkout)
-
-    name: Docker Linux Tier1
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: true
-      matrix:
-        target: [
-          i686-unknown-linux-gnu,
-          x86_64-unknown-linux-gnu,
-        ]
-    steps:
-      - uses: actions/checkout@v4
-      - 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 }}
-
-  macos:
-    permissions:
-      contents: read # to fetch code (actions/checkout)
-
-    name: macOS
-    runs-on: macos-13
-    strategy:
-      fail-fast: true
-      matrix:
-        target: [
-          x86_64-apple-darwin,
-        ]
-    steps:
-      - uses: actions/checkout@v4
-      - 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 }}
-
-  windows:
-    permissions:
-      contents: read # to fetch code (actions/checkout)
-
-    name: Windows
-    runs-on: windows-2022
-    env:
-      OS: windows
-    strategy:
-      fail-fast: true
-      matrix:
-        include:
-          - target: x86_64-pc-windows-gnu
-            env:
-              ARCH_BITS: 64
-              ARCH: x86_64
-          - target: x86_64-pc-windows-msvc
-          #- target: i686-pc-windows-gnu
-          #  env:
-          #    ARCH_BITS: 32
-          #    ARCH: i686
-          - target: i686-pc-windows-msvc
-    steps:
-      - uses: actions/checkout@v4
-      - name: Self-update rustup
-        run: rustup self update
-        shell: bash
-      - name: Setup Rust toolchain
-        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 }}
-        shell: bash
+env:
+  LIBC_CI: 1
 
+jobs:
   style_check:
-    permissions:
-      contents: read # to fetch code (actions/checkout)
-
     name: Style check
     runs-on: ubuntu-22.04
     steps:
@@ -94,9 +21,6 @@ jobs:
         run: sh ci/style.sh
 
   docker_linux_tier2:
-    permissions:
-      contents: read # to fetch code (actions/checkout)
-
     name: Docker Linux Tier2
     needs: [docker_linux_tier1, style_check]
     runs-on: ubuntu-22.04
@@ -123,18 +47,17 @@ jobs:
           wasm32-unknown-emscripten,
           x86_64-linux-android,
           # FIXME: Exec format error (os error 8)
-          #x86_64-unknown-linux-gnux32,
-          x86_64-unknown-linux-musl,
+          # - x86_64-unknown-linux-gnux32
+          - x86_64-unknown-linux-musl
           # FIXME: It seems some items in `src/unix/mod.rs`
           # aren't defined on redox actually.
-          # x86_64-unknown-redox,
-        ]
+          # - x86_64-unknown-redox
     steps:
       - uses: actions/checkout@v4
       - 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 }}
 
   # These targets are tier 3 or otherwise need to have CI build std via -Zbuild-std.
   # Because of this, only the nightly compiler can be used on these targets.
@@ -176,41 +99,33 @@ jobs:
         run: LIBC_CI=1 sh ./ci/run-docker.sh switch
 
   build_channels_linux:
-    permissions:
-      contents: read # to fetch code (actions/checkout)
-
     name: Build Channels Linux
-    needs: docker_linux_tier2
     runs-on: ubuntu-22.04
     env:
       OS: linux
     strategy:
       fail-fast: true
       max-parallel: 5
       matrix:
-        toolchain: [
-          stable,
-          beta,
-          nightly,
+        toolchain:
+          - stable
+          - beta
+          - nightly
           # FIXME: Disabled due to:
           # error: failed to parse registry's information for: serde
-          #1.13.0,
-          1.19.0,
-          1.24.0,
-          1.25.0,
-          1.30.0,
-        ]
+          # 1.13.0,
+          - 1.19.0
+          - 1.24.0
+          - 1.25.0
+          - 1.30.0
     steps:
       - uses: actions/checkout@v4
       - 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:
-    permissions:
-      contents: read # to fetch code (actions/checkout)
-
     name: Build Channels macOS
     needs: macos
     env:
@@ -229,47 +144,142 @@ 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:
-    permissions:
-      contents: read # to fetch code (actions/checkout)
-
     name: Build Channels Windows
     runs-on: windows-2022
     env:
       OS: windows
     strategy:
       fail-fast: true
       matrix:
-        toolchain: [
-          1.19.0,
-          1.24.0,
-          1.25.0,
-          1.30.0,
-          stable,
-        ]
+        toolchain:
+          - 1.19.0
+          - 1.24.0
+          - 1.25.0
+          - 1.30.0
+          - stable
     steps:
       - uses: actions/checkout@v4
       - name: Self-update rustup
         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:
-    permissions:
-      contents: read # to fetch code (actions/checkout)
+  macos:
+    name: macOS
+    runs-on: macos-13
+    strategy:
+      fail-fast: true
+      matrix:
+        target:
+          - x86_64-apple-darwin
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Rust toolchain
+        run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
+      - name: Execute run.sh
+        run: sh ./ci/run.sh ${{ matrix.target }}
 
+  windows:
+    name: Windows
+    runs-on: windows-2022
+    env:
+      OS: windows
+    strategy:
+      fail-fast: true
+      matrix:
+        include:
+          - target: x86_64-pc-windows-gnu
+            env:
+              ARCH_BITS: 64
+              ARCH: x86_64
+          - target: x86_64-pc-windows-msvc
+          #- target: i686-pc-windows-gnu
+          #  env:
+          #    ARCH_BITS: 32
+          #    ARCH: i686
+          - target: i686-pc-windows-msvc
+    steps:
+      - uses: actions/checkout@v4
+      - name: Self-update rustup
+        run: rustup self update
+        shell: bash
+      - name: Setup Rust toolchain
+        run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
+        shell: bash
+      - name: Execute run.sh
+        run: sh ./ci/run.sh ${{ matrix.target }}
+        shell: bash
+
+  docker_linux_tier1:
+    name: Docker Linux Tier1
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: true
+      matrix:
+        target:
+          - i686-unknown-linux-gnu
+          - x86_64-unknown-linux-gnu
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Rust toolchain
+        run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
+      - name: Execute run-docker.sh
+        run: sh ./ci/run-docker.sh ${{ matrix.target }}
+
+  docker_linux_tier2:
+    name: Docker Linux Tier2
+    needs: [docker_linux_tier1, style_check]
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: true
+      max-parallel: 12
+      matrix:
+        target:
+          - aarch64-linux-android
+          - aarch64-unknown-linux-gnu
+          - aarch64-unknown-linux-musl
+          - arm-linux-androideabi
+          - arm-unknown-linux-gnueabihf
+          - arm-unknown-linux-musleabihf
+          - i686-linux-android
+          - i686-unknown-linux-musl
+          - powerpc-unknown-linux-gnu
+          - powerpc64-unknown-linux-gnu
+          - powerpc64le-unknown-linux-gnu
+          - s390x-unknown-linux-gnu
+          - riscv64gc-unknown-linux-gnu
+          - wasm32-wasip1
+          - wasm32-wasip2
+          - sparc64-unknown-linux-gnu
+          - wasm32-unknown-emscripten
+          - x86_64-linux-android
+          # FIXME: Exec format error (os error 8)
+          # - x86_64-unknown-linux-gnux32
+          - x86_64-unknown-linux-musl
+          # FIXME: It seems some items in `src/unix/mod.rs`
+          # aren't defined on redox actually.
+          # - x86_64-unknown-redox
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Rust toolchain
+        run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
+      - name: Execute run-docker.sh
+        run: sh ./ci/run-docker.sh ${{ matrix.target }}
+
+  check_cfg:
     name: "Check #[cfg]s"
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - 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.