Merge branch 'master' into forapi

# Conflicts:
#	.github/workflows/build.yaml
#	debian/changelog
This commit is contained in:
lejianwen committed 2025-01-21 19:19:51 +08:00
commit ea3d353aa6
5 files changed
+9 -6

No files matched your search

+2 -2
View File
@@ -35,7 +35,7 @@ jobs:
- { name: "arm64v8", target: "aarch64-unknown-linux-musl" }
- { name: "armv7", target: "armv7-unknown-linux-musleabihf" }
- { name: "i386", target: "i686-unknown-linux-musl" }
- { name: "amd64fb", target: "x86_64-unknown-freebsd" }
#- { name: "amd64fb", target: "x86_64-unknown-freebsd" }
steps:
@@ -181,7 +181,7 @@ jobs:
- { os: "linux", name: "arm64v8", suffix: "" }
- { os: "linux", name: "armv7", suffix: "" }
- { os: "linux", name: "i386", suffix: "" }
- { os: "linux", name: "amd64fb", suffix: "" }
#- { os: "linux", name: "amd64fb", suffix: "" }
- { os: "windows", name: "x86_64", suffix: "-unsigned" }
steps: