Update to Rust 1.84/1.83, use musl for diesel and cargo-llvm-lines

tweedegolf · Jan 17, 2025 · 616165e · 616165e
1 parent 09779ce
commit 616165e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -8,9 +8,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - rust_arch: aarch64-unknown-linux-gnu
+          - rust_arch: aarch64-unknown-linux-musl
             docker_arch: arm64
-          - rust_arch: x86_64-unknown-linux-gnu
+          - rust_arch: x86_64-unknown-linux-musl
             docker_arch: amd64
     runs-on: ubuntu-latest
     steps:
@@ -29,12 +29,12 @@ jobs:
           cargo clone diesel_cli
           cd diesel_cli
           cat << EOF > Cross.toml
-          [target.aarch64-unknown-linux-gnu]
+          [target.aarch64-unknown-linux-musl]
           pre-build = [
               "dpkg --add-architecture arm64",
               "apt-get update && apt-get install --assume-yes libpq-dev:arm64"
           ]
-          [target.x86_64-unknown-linux-gnu]
+          [target.x86_64-unknown-linux-musl]
           pre-build = [
               "dpkg --add-architecture amd64",
               "apt-get update && apt-get install --assume-yes libpq-dev:amd64"
@@ -54,9 +54,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - rust_arch: aarch64-unknown-linux-gnu
+          - rust_arch: aarch64-unknown-linux-musl
             docker_arch: arm64
-          - rust_arch: x86_64-unknown-linux-gnu
+          - rust_arch: x86_64-unknown-linux-musl
             docker_arch: amd64
     runs-on: ubuntu-latest
     steps:
@@ -97,9 +97,9 @@ jobs:
             latest: false
           - version: nightly
             latest: false
-          - version: "1.82"
+          - version: "1.84"
             latest: true
-          - version: "1.81"
+          - version: "1.83"
             latest: false
     runs-on: ubuntu-latest
     steps:

diff --git a/README.md b/README.md
@@ -7,8 +7,8 @@ to it (and install any optional library dependencies). Currently these versions
 are supported:
 
 * Rust stable: `stable` (`ghcr.io/tweedegolf/rust-dev:stable`)
-* Rust 1.82: `1.82`, `latest` (`ghcr.io/tweedegolf/rust-dev:1.82`)
-* Rust 1.81: `1.81` (`ghcr.io/tweedegolf/rust-dev:1.81`)
+* Rust 1.84: `1.84`, `latest` (`ghcr.io/tweedegolf/rust-dev:1.84`)
+* Rust 1.83: `1.83` (`ghcr.io/tweedegolf/rust-dev:1.83`)
 * Rust beta: `beta` (`ghcr.io/tweedegolf/rust-dev:beta`)
 * Rust nightly: `nightly` (`ghcr.io/tweedegolf/rust-dev:nightly`)