Rename linux-x64 binary to linux-x86_64-gnu

printfn · Sep 14, 2024 · 30333d7 · 30333d7
1 parent 1815f83
commit 30333d7
Show file tree

Hide file tree

Showing 7 changed files with 205 additions and 200 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -20,7 +20,7 @@ jobs:
         include:
           - platform: ubuntu-24.04
             artifact-path: target/release/fend
-            artifact-platform-name: linux-x64
+            artifact-platform-name: linux-x86_64-gnu
             env-command: ">> $GITHUB_ENV"
           - platform: macos-14
             artifact-path: target/release/fend

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -16,7 +16,7 @@ fend-core.workspace = true
 home = "0.5.9"
 rand = { version = "0.8.5", default-features = false, features = ["std", "std_rng"] }
 rustyline = { version =  "14.0.0", default-features = false, features = ["with-file-history", "custom-bindings"] }
-serde = { version = "1.0.209", default-features = false }
+serde = { version = "1.0.210", default-features = false }
 toml = { version = "0.8.19", default-features = false, features = ["parse"] }
 minreq = { version = "2.12.0", default-features = false, optional = true }
 

diff --git a/contrib/deploy.sh b/contrib/deploy.sh
@@ -212,8 +212,8 @@ gh run download "$GH_RUN_ID" --dir "$TMPDIR/artifacts"
 echo "Zipping artifacts..."
 # --junk-paths prevents directory names from being stored in the zip file,
 # so the binary is stored at the top level
-zip --junk-paths "$TMPDIR/artifacts/fend-$NEW_VERSION-linux-x64.zip" \
-	"$TMPDIR/artifacts/fend-$NEW_VERSION-linux-x64/fend"
+zip --junk-paths "$TMPDIR/artifacts/fend-$NEW_VERSION-linux-x86_64-gnu.zip" \
+	"$TMPDIR/artifacts/fend-$NEW_VERSION-linux-x86_64-gnu/fend"
 zip --junk-paths "$TMPDIR/artifacts/fend-$NEW_VERSION-linux-aarch64-gnu.zip" \
 	"$TMPDIR/artifacts/fend-$NEW_VERSION-linux-aarch64-gnu/fend"
 zip --junk-paths "$TMPDIR/artifacts/fend-$NEW_VERSION-linux-armv7-gnueabihf.zip" \
@@ -235,7 +235,7 @@ gh release --repo printfn/fend \
 	create "v$NEW_VERSION" --title "Version $NEW_VERSION" \
 	--notes "$CHANGELOG2" \
 	--draft \
-	"$TMPDIR/artifacts/fend-$NEW_VERSION-linux-x64.zip" \
+	"$TMPDIR/artifacts/fend-$NEW_VERSION-linux-x86_64-gnu.zip" \
 	"$TMPDIR/artifacts/fend-$NEW_VERSION-linux-aarch64-gnu.zip" \
 	"$TMPDIR/artifacts/fend-$NEW_VERSION-linux-armv7-gnueabihf.zip" \
 	"$TMPDIR/artifacts/fend-$NEW_VERSION-linux-x86_64-musl.zip" \