Merge #1333

1333: bump arm-unknown-linux-gnueabihf to glibc 2.31 r=Emilgardis a=Emilgardis resolves #1331 Co-authored-by: Emil Gardström <emil.gardstrom@gmail.com>
cross-rs · Sep 16, 2023 · 3bfc6d5 · 3bfc6d5
2 parents b3085a1 + 549c4bd
commit 3bfc6d5
Show file tree

Hide file tree

Showing 6 changed files with 201 additions and 97 deletions.
diff --git a/.changes/1333.json b/.changes/1333.json
@@ -0,0 +1,4 @@
+{
+    "description": "set arm-unknown-linux-gnueabihf to use glibc 2.31",
+    "type": "changed"
+}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -157,7 +157,7 @@ jobs:
         id: build-docker-image
         if: steps.prepare-meta.outputs.has-image
         timeout-minutes: 120
-        run: cargo xtask build-docker-image -v "${TARGET}${SUB:+.$SUB}"
+        run: cargo xtask build-docker-image -v "${TARGET}${SUB:+.$SUB}" ${{ matrix.verbose && '-v' }}
         env:
           TARGET: ${{ matrix.target }}
           SUB: ${{ matrix.sub }}

diff --git a/README.md b/README.md
@@ -331,7 +331,7 @@ terminate.
 | `aarch64-unknown-linux-musl`         | 1.1.24 | 9.2.0   | ✓   | 6.1.0 |   ✓    |
 | `arm-linux-androideabi` [1]          | 9.0.8  | 9.0.8   | ✓   | 6.1.0 |   ✓    |
 | `arm-unknown-linux-gnueabi`          | 2.31   | 9.4.0   | ✓   | 6.1.0 |   ✓    |
-| `arm-unknown-linux-gnueabihf`        | 2.17   | 8.3.0   | ✓   | 6.1.0 |   ✓    |
+| `arm-unknown-linux-gnueabihf`        | 2.31   | 8.5.0   | ✓   | 6.1.0 |   ✓    |
 | `arm-unknown-linux-musleabi`         | 1.1.24 | 9.2.0   | ✓   | 6.1.0 |   ✓    |
 | `arm-unknown-linux-musleabihf`       | 1.1.24 | 9.2.0   | ✓   | 6.1.0 |   ✓    |
 | `armv5te-unknown-linux-gnueabi`      | 2.31   | 9.4.0   | ✓   | 6.1.0 |   ✓    |