From 6b12049df09d9c24ac052fb7d889ecb9be5958b8 Mon Sep 17 00:00:00 2001 From: JustMe Date: Sun, 4 Oct 2026 12:44:32 -0700 Subject: [PATCH] ci: drop 32-bit release targets [CI SKIP] --- .woodpecker/windows-release.yml | 54 --------------------------------- README.md | 2 +- ci/package-cross-platform.ps1 | 2 -- ci/publish-gitea-release.sh | 6 +--- ci/release-cross-platform.ps1 | 4 +-- docs/deployment.md | 4 +-- 6 files changed, 6 insertions(+), 66 deletions(-) diff --git a/.woodpecker/windows-release.yml b/.woodpecker/windows-release.yml index ca53c68..2a5d6c0 100644 --- a/.woodpecker/windows-release.yml +++ b/.woodpecker/windows-release.yml @@ -69,30 +69,6 @@ steps: commands: *build-commands depends_on: [] - - name: build-linux-arm-agent - image: powershell - environment: &rid-linux-arm-agent - <<: *build-environment - RID: linux-arm - commands: *build-commands - depends_on: [] - - - name: build-linux-arm-probe - image: powershell - environment: &rid-linux-arm-probe - <<: *rid-linux-arm-agent - COMPONENT: probe - commands: *build-commands - depends_on: [] - - - name: build-linux-arm-enroll - image: powershell - environment: &rid-linux-arm-enroll - <<: *rid-linux-arm-agent - COMPONENT: fleet-enroll - commands: *build-commands - depends_on: [] - - name: build-linux-musl-x64-agent image: powershell environment: &rid-linux-musl-x64-agent @@ -141,30 +117,6 @@ steps: commands: *build-commands depends_on: [] - - name: build-linux-musl-arm-agent - image: powershell - environment: &rid-linux-musl-arm-agent - <<: *build-environment - RID: linux-musl-arm - commands: *build-commands - depends_on: [] - - - name: build-linux-musl-arm-probe - image: powershell - environment: &rid-linux-musl-arm-probe - <<: *rid-linux-musl-arm-agent - COMPONENT: probe - commands: *build-commands - depends_on: [] - - - name: build-linux-musl-arm-enroll - image: powershell - environment: &rid-linux-musl-arm-enroll - <<: *rid-linux-musl-arm-agent - COMPONENT: fleet-enroll - commands: *build-commands - depends_on: [] - - name: build-macos-x64-agent image: powershell environment: &rid-macos-x64-agent @@ -274,18 +226,12 @@ steps: - build-linux-arm64-agent - build-linux-arm64-probe - build-linux-arm64-enroll - - build-linux-arm-agent - - build-linux-arm-probe - - build-linux-arm-enroll - build-linux-musl-x64-agent - build-linux-musl-x64-probe - build-linux-musl-x64-enroll - build-linux-musl-arm64-agent - build-linux-musl-arm64-probe - build-linux-musl-arm64-enroll - - build-linux-musl-arm-agent - - build-linux-musl-arm-probe - - build-linux-musl-arm-enroll - build-macos-x64-agent - build-macos-x64-probe - build-macos-x64-enroll diff --git a/README.md b/README.md index 4833812..dfc4fb4 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ npm run build --prefix web 前端产物位于 `web/display/dist/` 和 `web/admin/dist/`。NativeAOT 目标平台和 Windows 上使用 AotAnywhere 交叉构建的说明见 [`docs/deployment.md`](docs/deployment.md)。 -Backend 以 OCI 镜像发布，支持 Linux/amd64 与 Linux/arm64；Agent 和 Probe 发布 Linux glibc/musl x64、arm64、arm，macOS x64/arm64，以及 Windows x64/arm64 二进制包。容器部署配置见 [`compose.yaml`](compose.yaml)，发布说明见 [`docs/deployment.md`](docs/deployment.md)。 +Backend 以 OCI 镜像发布，支持 Linux/amd64 与 Linux/arm64；Agent 和 Probe 发布 Linux glibc/musl x64、arm64，macOS x64/arm64，以及 Windows x64/arm64 二进制包。容器部署配置见 [`compose.yaml`](compose.yaml)，发布说明见 [`docs/deployment.md`](docs/deployment.md)。 ### 本地运行 diff --git a/ci/package-cross-platform.ps1 b/ci/package-cross-platform.ps1 index ba44f20..c4a2e49 100644 --- a/ci/package-cross-platform.ps1 +++ b/ci/package-cross-platform.ps1 @@ -55,10 +55,8 @@ try { $targets = @( @{ Rid = 'linux-x64'; Os = 'linux'; Arch = 'amd64'; Windows = $false }, @{ Rid = 'linux-arm64'; Os = 'linux'; Arch = 'arm64'; Windows = $false }, - @{ Rid = 'linux-arm'; Os = 'linux'; Arch = 'arm'; Windows = $false }, @{ Rid = 'linux-musl-x64'; Os = 'linux'; Arch = 'musl-amd64'; Windows = $false }, @{ Rid = 'linux-musl-arm64'; Os = 'linux'; Arch = 'musl-arm64'; Windows = $false }, - @{ Rid = 'linux-musl-arm'; Os = 'linux'; Arch = 'musl-arm'; Windows = $false }, @{ Rid = 'osx-x64'; Os = 'macos'; Arch = 'x64'; Windows = $false }, @{ Rid = 'osx-arm64'; Os = 'macos'; Arch = 'arm64'; Windows = $false }, @{ Rid = 'win-x64'; Os = 'windows'; Arch = 'amd64'; Windows = $true }, diff --git a/ci/publish-gitea-release.sh b/ci/publish-gitea-release.sh index 1b3ba1d..4b029f3 100644 --- a/ci/publish-gitea-release.sh +++ b/ci/publish-gitea-release.sh @@ -26,7 +26,7 @@ printf 'machine %s login justme password %s\n' "$gitea_host" "$GITEA_TOKEN" > "$ chmod 600 "$netrc" trap 'rm -rf "$tmp"' EXIT -release_body="Agent and Probe builds: Linux glibc and musl (x64, arm64, arm), macOS (x64, arm64), and Windows (x64, arm64). macOS binaries are not Developer ID signed or notarized. Backend OCI images: registry.oeo.one/monitor/monitor-backend:$version (linux/amd64 and linux/arm64)." +release_body="Agent and Probe builds: Linux glibc and musl (x64, arm64), macOS (x64, arm64), and Windows (x64, arm64). macOS binaries are not Developer ID signed or notarized. Backend OCI images: registry.oeo.one/monitor/monitor-backend:$version (linux/amd64 and linux/arm64)." payload="$(printf '{"tag_name":"%s","target_commitish":"%s","name":"MyMonitor %s","body":"%s","draft":false,"prerelease":false}' \ "$tag" "${CI_COMMIT_SHA:-}" "$tag" "$release_body")" release_status="$(curl --silent --show-error --retry 3 --netrc-file "$netrc" \ @@ -64,14 +64,10 @@ assets=( "monitor-agent-v$version-linux-arm64.tar.gz" "monitor-probe-v$version-linux-amd64.tar.gz" "monitor-probe-v$version-linux-arm64.tar.gz" - "monitor-agent-v$version-linux-arm.tar.gz" - "monitor-probe-v$version-linux-arm.tar.gz" "monitor-agent-v$version-linux-musl-amd64.tar.gz" "monitor-probe-v$version-linux-musl-amd64.tar.gz" "monitor-agent-v$version-linux-musl-arm64.tar.gz" "monitor-probe-v$version-linux-musl-arm64.tar.gz" - "monitor-agent-v$version-linux-musl-arm.tar.gz" - "monitor-probe-v$version-linux-musl-arm.tar.gz" "monitor-agent-v$version-macos-x64.tar.gz" "monitor-probe-v$version-macos-x64.tar.gz" "monitor-agent-v$version-macos-arm64.tar.gz" diff --git a/ci/release-cross-platform.ps1 b/ci/release-cross-platform.ps1 index 8b2ca53..1149511 100644 --- a/ci/release-cross-platform.ps1 +++ b/ci/release-cross-platform.ps1 @@ -1,8 +1,8 @@ param( [Parameter(Mandatory)] [ValidateSet( - 'linux-x64', 'linux-arm64', 'linux-arm', - 'linux-musl-x64', 'linux-musl-arm64', 'linux-musl-arm', + 'linux-x64', 'linux-arm64', + 'linux-musl-x64', 'linux-musl-arm64', 'osx-x64', 'osx-arm64', 'win-x64', 'win-arm64' )] [string]$RuntimeIdentifier, diff --git a/docs/deployment.md b/docs/deployment.md index 1b2f8cc..22860d1 100644 --- a/docs/deployment.md +++ b/docs/deployment.md @@ -11,8 +11,8 @@ scripts/package.sh → backend/art | rid | 目标 | 构建方式 | | --- | --- | --- | -| `linux-x64`、`linux-arm64`、`linux-arm` | Debian/Ubuntu glibc、ARMv7 | Windows CI 主机通过 AotAnywhere 交叉编译 | -| `linux-musl-x64`、`linux-musl-arm64`、`linux-musl-arm` | Alpine、OpenWrt、musl ARMv7 | Windows CI 主机通过 AotAnywhere 交叉编译 | +| `linux-x64`、`linux-arm64` | Debian/Ubuntu glibc 服务器 | Windows CI 主机通过 AotAnywhere 交叉编译 | +| `linux-musl-x64`、`linux-musl-arm64` | Alpine、amd64 OpenWrt、aarch64 OpenWrt 路由器 | Windows CI 主机通过 AotAnywhere 交叉编译 | | `osx-x64`、`osx-arm64` | Intel Mac、Apple Silicon | Windows CI 主机通过 AotAnywhere 交叉编译；发布包未做 Developer ID 签名或 Apple 公证 | | `win-x64`、`win-arm64` | Windows x64、ARM64 | Windows CI 主机上的 Visual Studio C++ 工具链 |