[0.2] Backports

.github/workflows/ci.yaml

@@ -51,12 +51,18 @@ jobs:
     name: Verify build
     strategy:
       matrix:
-        toolchain: [stable, nightly, 1.63.0]
-        os: [ubuntu-24.04, macos-15, windows-2025]
+        toolchain: [stable, 1.63.0]
         include:
+          # Nightly has a lot of targets, so split it in half
+          - toolchain: nightly
+            half: 1
+          - toolchain: nightly
+            half: 2
           - toolchain: beta
-            os: ubuntu-24.04
-    runs-on: ${{ matrix.os }}
+            only: '(aarch64|x86_64)' # just a spot check for beta
+          - toolchain: stable
+          - toolchain: 1.63.0 # msrv
+    runs-on: ubuntu-24.04
     timeout-minutes: 25
     env:
       TOOLCHAIN: ${{ matrix.toolchain }}
@@ -78,12 +84,15 @@ jobs:
       - name: Target size after restoring cache
         run: du -sh target | sort -k 2 || true
 
-      - name: Execute build.sh
+      - name: Execute build check
         run: |
           set -eux
           # Remove `-Dwarnings` at the MSRV since lints may be different
           [ "${{ matrix.toolchain }}" = "1.63.0" ] && export RUSTFLAGS=""
-          ./ci/verify-build.sh
+          python3 ci/verify-build.py \
+            --toolchain "$TOOLCHAIN" \
+            ${{ matrix.only && format('--only "{0}"', matrix.only) }} \
+            ${{ matrix.half && format('--half "{0}"', matrix.half) }}
       - name: Target size after job completion
         run: du -sh target | sort -k 2
 
@@ -92,41 +101,25 @@ jobs:
     strategy:
       matrix:
         include:
-          - target: i686-unknown-linux-gnu
-            docker: true
-            os: ubuntu-24.04
-          - target: i686-unknown-linux-gnu
-            docker: true
-            os: ubuntu-24.04
-            artifact-tag: offset-bits64
-            env:
-              RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS: 64
-          - target: i686-unknown-linux-gnu
-            docker: true
-            os: ubuntu-24.04
-            artifact-tag: time-bits64
-            env:
-              RUST_LIBC_UNSTABLE_GNU_TIME_BITS: 64
-          - target: x86_64-unknown-linux-gnu
-            docker: true
-            os: ubuntu-24.04
           - target: aarch64-apple-darwin
             os: macos-15
-          - target: x86_64-pc-windows-gnu
-            os: windows-2025
-            env:
-              ARCH_BITS: 64
-              ARCH: x86_64
-          - target: x86_64-pc-windows-msvc
-            os: windows-2025
+          - target: aarch64-pc-windows-msvc
+            os: windows-11-arm
+          - target: aarch64-unknown-linux-gnu
+            os: ubuntu-24.04-arm
           # FIXME: It currently causes segfaults.
           #- target: i686-pc-windows-gnu
-          #  env:
-          #    ARCH_BITS: 32
-          #    ARCH: i686
+          #  env: { ARCH_BITS: 32, ARCH: i686 }
           - target: i686-pc-windows-msvc
             os: windows-2025
-    runs-on: ${{ matrix.os }}
+          - target: i686-unknown-linux-gnu
+          - target: x86_64-pc-windows-gnu
+            os: windows-2025
+            env: { ARCH_BITS: 64, ARCH: x86_64 }
+          - target: x86_64-pc-windows-msvc
+            os: windows-2025
+          - target: x86_64-unknown-linux-gnu
+    runs-on: ${{ matrix.os && matrix.os || 'ubuntu-24.04' }}
     timeout-minutes: 25
     env:
       TARGET: ${{ matrix.target }}
@@ -146,17 +139,17 @@ jobs:
         shell: bash
 
       - name: Run natively
-        if: "!matrix.docker"
+        if: runner.os != 'Linux'
         run: ./ci/run.sh ${{ matrix.target }}
       - name: Run in Docker
-        if: "matrix.docker"
+        if: runner.os == 'Linux'
         run: ./ci/run-docker.sh ${{ matrix.target }}
 
       - name: Create CI artifacts
         id: create_artifacts
         if: always()
-        run: ./ci/create-artifacts.py
-      - uses: actions/upload-artifact@v4
+        run: python3 ci/create-artifacts.py
+      - uses: actions/upload-artifact@v5
         if: always() && steps.create_artifacts.outcome == 'success'
         with:
           name: ${{ env.ARCHIVE_NAME }}-${{ matrix.target }}${{ matrix.artifact-tag && format('-{0}', matrix.artifact-tag) }}
@@ -166,79 +159,64 @@ jobs:
   # Unlike `main` this job doesn't have `needs`, in order to speed up backports a bit
   test_tier2:
     name: Test tier2
-    runs-on: ubuntu-24.04
+    needs: [test_tier1, style_check]
     strategy:
       fail-fast: true
-      max-parallel: 12
+      max-parallel: 16
       matrix:
-        target:
+        include:
           # FIXME(sparc): this takes much longer to run than any other job, put
           # it first to make sure it gets a head start.
-          - sparc64-unknown-linux-gnu
-          - aarch64-linux-android
-          - aarch64-unknown-linux-gnu
-          - aarch64-unknown-linux-musl
-          - arm-linux-androideabi
-          - arm-unknown-linux-musleabihf
-          # FIXME(#4297): Disabled due to spurious failueSome android jobs are disabled because of high rates of
-          # - i686-linux-android
-          - i686-unknown-linux-musl
-          - loongarch64-unknown-linux-gnu
-          - loongarch64-unknown-linux-musl
-          - powerpc64-unknown-linux-gnu
-          - powerpc64le-unknown-linux-gnu
-          - powerpc64le-unknown-linux-musl
-          - riscv64gc-unknown-linux-gnu
-          - s390x-unknown-linux-gnu
-          - wasm32-unknown-emscripten
-          - wasm32-wasip1
-          - wasm32-wasip2
-          - 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
-        include:
-          - target: arm-unknown-linux-gnueabihf
-          - target: arm-unknown-linux-gnueabihf
-            env:
-              RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS: 64
-            artifact-tag: offset-bits64
-          - target: arm-unknown-linux-gnueabihf
-            env:
-              RUST_LIBC_UNSTABLE_GNU_TIME_BITS: 64
-            artifact-tag: time-bits64
+          - target: sparc64-unknown-linux-gnu
+          - target: aarch64-linux-android
           - target: aarch64-unknown-linux-musl
-            env:
-              RUST_LIBC_UNSTABLE_MUSL_V1_2_3: 1
+          - target: aarch64-unknown-linux-musl
+            env: { RUST_LIBC_UNSTABLE_MUSL_V1_2_3: 1 }
+            artifact-tag: new-musl
+          - target: arm-linux-androideabi
+          - target: arm-unknown-linux-gnueabihf
+          - target: arm-unknown-linux-musleabihf
           - target: arm-unknown-linux-musleabihf
-            env:
-              RUST_LIBC_UNSTABLE_MUSL_V1_2_3: 1
+            env: { RUST_LIBC_UNSTABLE_MUSL_V1_2_3: 1 }
+            artifact-tag: new-musl
+          # FIXME(#4297): Disabled due to spurious failue
+          # - target: i686-linux-android
           - target: i686-unknown-linux-musl
-            env:
-              RUST_LIBC_UNSTABLE_MUSL_V1_2_3: 1
+          - target: i686-unknown-linux-musl
+            env: { RUST_LIBC_UNSTABLE_MUSL_V1_2_3: 1 }
+            artifact-tag: new-musl
+          - target: loongarch64-unknown-linux-gnu
+          - target: loongarch64-unknown-linux-musl
           - target: loongarch64-unknown-linux-musl
-            env:
-              RUST_LIBC_UNSTABLE_MUSL_V1_2_3: 1
+            env: { RUST_LIBC_UNSTABLE_MUSL_V1_2_3: 1 }
+            artifact-tag: new-musl
+          - target: powerpc64-unknown-linux-gnu
+          - target: powerpc64le-unknown-linux-gnu
           - target: powerpc64le-unknown-linux-musl
-            env:
-              RUST_LIBC_UNSTABLE_MUSL_V1_2_3: 1
+          - target: powerpc64le-unknown-linux-musl
+            env: { RUST_LIBC_UNSTABLE_MUSL_V1_2_3: 1 }
+            artifact-tag: new-musl
+          - target: riscv64gc-unknown-linux-gnu
+          - target: s390x-unknown-linux-gnu
+          - target: wasm32-unknown-emscripten
+          - target: wasm32-wasip1
+          - target: wasm32-wasip2
+          - target: x86_64-apple-darwin
+            os: macos-15-intel
+          - target: x86_64-linux-android
+          # FIXME: Exec format error (os error 8)
+          # - target: x86_64-unknown-linux-gnux32
+          - target: x86_64-unknown-linux-musl
           - target: x86_64-unknown-linux-musl
-            env:
-              RUST_LIBC_UNSTABLE_MUSL_V1_2_3: 1
+            env: { RUST_LIBC_UNSTABLE_MUSL_V1_2_3: 1 }
+            artifact-tag: new-musl
+          # FIXME: It seems some items in `src/unix/mod.rs` aren't defined on redox actually.
+          # - target: x86_64-unknown-redox
+
           # FIXME(ppc): SIGILL running tests, see
           # https://github.com/rust-lang/libc/pull/4254#issuecomment-2636288713
           # - target: powerpc-unknown-linux-gnu
-          # - target: powerpc-unknown-linux-gnu
-          #   env:
-          #     RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS: 64
-          #   artifact-tag: offset-bits64
-          # - target: powerpc-unknown-linux-gnu
-          #   env:
-          #     RUST_LIBC_UNSTABLE_GNU_TIME_BITS: 64
-          #   artifact-tag: time-bits64
+    runs-on: ${{ matrix.os && matrix.os || 'ubuntu-24.04' }}
     timeout-minutes: 25
     env:
       TARGET: ${{ matrix.target }}
@@ -257,14 +235,18 @@ jobs:
             jq -r 'to_entries | map("\(.key)=\(.value|tostring)") | .[]' >>$GITHUB_ENV
         shell: bash
 
-      - name: Execute run-docker.sh
+      - name: Run natively
+        if: runner.os != 'Linux'
+        run: ./ci/run.sh ${{ matrix.target }}
+      - name: Run in Docker
+        if: runner.os == 'Linux'
         run: ./ci/run-docker.sh ${{ matrix.target }}
 
       - name: Create CI artifacts
         id: create_artifacts
         if: always()
         run: ./ci/create-artifacts.py
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         if: always() && steps.create_artifacts.outcome == 'success'
         with:
           name: ${{ env.ARCHIVE_NAME }}-${{ matrix.target }}${{ matrix.artifact-tag && format('-{0}', matrix.artifact-tag) }}
@@ -277,13 +259,14 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        target:
-          - x86_64-pc-solaris
+        include:
+          - target: x86_64-pc-solaris
     timeout-minutes: 25
     steps:
       - uses: actions/checkout@v5
       - name: test on Solaris
         uses: vmactions/[email protected]
+        if: contains(matrix.target, 'solaris')
         with:
           release: "11.4-gcc"
           usesh: true

README.md

@@ -71,7 +71,7 @@ but this is not guaranteed.
 You can see the platform(target)-specific docs on [docs.rs], select a platform
 you want to see.
 
-See [`ci/verify-build.sh`](https://github.com/rust-lang/libc/blob/HEAD/ci/verify-build.sh) for
+See [`ci/verify-build.py`](https://github.com/rust-lang/libc/blob/HEAD/ci/verify-build.py) for
 the platforms on which `libc` is guaranteed to build for each Rust toolchain.
 The test-matrix at [GitHub Actions] and [Cirrus CI] show the platforms in which
 `libc` tests are run.