♻️ refactor: hard written target_arch、target_os_info (#14)

gouzil · web-flow · commit 5f6170bc119f · 2025-04-16T00:21:29.000+08:00
diff --git a/.github/workflows/lint-and-fmt.yml b/.github/workflows/lint-and-fmt.yml
@@ -30,6 +30,9 @@ jobs:
           architecture: ${{ matrix.architecture }}
 
       - name: Install dependencies
+        env:
+          CIBW_ARCHS: "x86_64"
+          CIBW_PLATFORM: "manylinux_2_17"
         run: |
           uv sync --all-extras --dev
 
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
+  pull_request:
   workflow_dispatch:
 
 jobs:
@@ -12,12 +13,14 @@ jobs:
     strategy:
       matrix:
         platform:
-          - {"runner": "ubuntu-latest", "os": "linux", "target": "x86_64"}
-          - {"runner": "ubuntu-latest", "os": "linux", "target": "aarch64"}
-          - {"runner": "windows-latest", "os": "win", "target": "x86_64"}
-          - {"runner": "windows-latest", "os": "win", "target": "arm64"}
-          - {"runner": "macos-latest", "os": "macos", "target": "x86_64"}
-          - {"runner": "macos-latest", "os": "macos", "target": "arm64"}
+          - {"runner": "ubuntu-latest", "platform_tag": "musllinux_1_2", "arch": "x86_64"}
+          - {"runner": "ubuntu-latest", "platform_tag": "musllinux_1_2", "arch": "aarch64"}
+          - {"runner": "ubuntu-latest", "platform_tag": "manylinux_2_17", "arch": "x86_64"}
+          - {"runner": "ubuntu-latest", "platform_tag": "manylinux_2_17", "arch": "aarch64"}
+          - {"runner": "windows-latest", "platform_tag": "win", "arch": "amd64"}
+          - {"runner": "windows-latest", "platform_tag": "win", "arch": "arm64"}
+          - {"runner": "macos-latest", "platform_tag": "macosx_10_9", "arch": "x86_64"}
+          - {"runner": "macos-latest", "platform_tag": "macosx_11_0", "arch": "arm64"}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -32,15 +35,15 @@ jobs:
 
       - name: build release distributions
         env:
-          CIBW_ARCHS: ${{ matrix.platform.target }}
-          CIBW_PLATFORM: ${{ matrix.platform.os }}
+          CIBW_ARCHS: ${{ matrix.platform.arch }}
+          CIBW_PLATFORM: ${{ matrix.platform.platform_tag }}
         run: |
           uv build
 
       - name: upload dists
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.platform.os }}-${{ matrix.platform.target }}
+          name: ${{ matrix.platform.platform_tag }}-${{ matrix.platform.arch }}
           path: dist/
 
   publish-pypi:
@@ -54,17 +57,19 @@ jobs:
     strategy:
       matrix:
         platform:
-          - {"runner": "ubuntu-latest", "os": "linux", "target": "x86_64"}
-          - {"runner": "ubuntu-latest", "os": "linux", "target": "aarch64"}
-          - {"runner": "windows-latest", "os": "win", "target": "x86_64"}
-          - {"runner": "windows-latest", "os": "win", "target": "arm64"}
-          - {"runner": "macos-latest", "os": "macos", "target": "x86_64"}
-          - {"runner": "macos-latest", "os": "macos", "target": "arm64"}
+          - {"runner": "ubuntu-latest", "platform_tag": "musllinux_1_2", "arch": "x86_64"}
+          - {"runner": "ubuntu-latest", "platform_tag": "musllinux_1_2", "arch": "aarch64"}
+          - {"runner": "ubuntu-latest", "platform_tag": "manylinux_2_17", "arch": "x86_64"}
+          - {"runner": "ubuntu-latest", "platform_tag": "manylinux_2_17", "arch": "aarch64"}
+          - {"runner": "windows-latest", "platform_tag": "win", "arch": "amd64"}
+          - {"runner": "windows-latest", "platform_tag": "win", "arch": "arm64"}
+          - {"runner": "macos-latest", "platform_tag": "macosx_10_9", "arch": "x86_64"}
+          - {"runner": "macos-latest", "platform_tag": "macosx_11_0", "arch": "arm64"}
     steps:
       - name: Retrieve release distributions
         uses: actions/download-artifact@v4
         with:
-          name: ${{ matrix.platform.os }}-${{ matrix.platform.target }}
+          name: ${{ matrix.platform.platform_tag }}-${{ matrix.platform.arch }}
           path: dist/
 
       - name: Install uv
@@ -84,16 +89,18 @@ jobs:
     strategy:
       matrix:
         platform:
-          - {"runner": "ubuntu-latest", "os": "linux", "target": "x86_64"}
-          - {"runner": "ubuntu-latest", "os": "linux", "target": "aarch64"}
-          - {"runner": "windows-latest", "os": "win", "target": "x86_64"}
-          - {"runner": "windows-latest", "os": "win", "target": "arm64"}
-          - {"runner": "macos-latest", "os": "macos", "target": "x86_64"}
-          - {"runner": "macos-latest", "os": "macos", "target": "arm64"}
+          - {"runner": "ubuntu-latest", "platform_tag": "musllinux_1_2", "arch": "x86_64"}
+          - {"runner": "ubuntu-latest", "platform_tag": "musllinux_1_2", "arch": "aarch64"}
+          - {"runner": "ubuntu-latest", "platform_tag": "manylinux_2_17", "arch": "x86_64"}
+          - {"runner": "ubuntu-latest", "platform_tag": "manylinux_2_17", "arch": "aarch64"}
+          - {"runner": "windows-latest", "platform_tag": "win", "arch": "amd64"}
+          - {"runner": "windows-latest", "platform_tag": "win", "arch": "arm64"}
+          - {"runner": "macos-latest", "platform_tag": "macosx_10_9", "arch": "x86_64"}
+          - {"runner": "macos-latest", "platform_tag": "macosx_11_0", "arch": "arm64"}
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: ${{ matrix.platform.os }}-${{ matrix.platform.target }}
+          name: ${{ matrix.platform.platform_tag }}-${{ matrix.platform.arch }}
           path: dist/
       - name: Get tag name
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
diff --git a/hatch_build.py b/hatch_build.py
@@ -1,10 +1,8 @@
 from __future__ import annotations
 
 import os
-import platform
 import re
 import shutil
-import sys
 import tarfile
 import tempfile
 from pathlib import Path
@@ -13,6 +11,18 @@
 
 from hatchling.builders.hooks.plugin.interface import BuildHookInterface
 
+# key 为 pypi 分发的系统和架构组合
+BUILD_TARGET = {
+    ("musllinux_1_2", "x86_64"): {"download_file": ("linux", "x86_64")},
+    ("musllinux_1_2", "aarch64"): {"download_file": ("linux", "arm64")},
+    ("manylinux_2_17", "x86_64"): {"download_file": ("linux", "x86_64")},
+    ("manylinux_2_17", "aarch64"): {"download_file": ("linux", "arm64")},
+    ("macosx_10_9", "x86_64"): {"download_file": ("darwin", "x86_64")},
+    ("macosx_11_0", "arm64"): {"download_file": ("darwin", "arm64")},
+    ("win", "amd64"): {"download_file": ("windows", "x86_64")},
+    ("win", "arm64"): {"download_file": ("windows", "arm64")},
+}
+
 
 class SpecialBuildHook(BuildHookInterface):
     BIN_NAME = "yamlfmt"
@@ -27,24 +37,14 @@ def initialize(self, version: str, build_data: dict[str, Any]) -> None:
         if self.target_name != "wheel":
             return
 
-        target_arch = os.environ.get("CIBW_ARCHS", platform.machine()).lower()
-        target_os_info = os.environ.get("CIBW_PLATFORM", sys.platform).lower()
-
-        if target_arch not in ["x86_64", "arm64", "aarch64"]:
-            raise NotImplementedError(f"no support arch: {target_arch}")
+        target_arch = os.environ.get("CIBW_ARCHS", None)
+        target_os_info = os.environ.get("CIBW_PLATFORM", None)
 
-        if not any(os_name in target_os_info for os_name in ["linux", "darwin", "macos", "win"]):
-            raise NotImplementedError(f"no support os: {target_os_info}")
+        assert target_arch is not None, f"CIBW_ARCHS not set see: {BUILD_TARGET}"
+        assert target_os_info is not None, f"CIBW_PLATFORM not set see: {BUILD_TARGET}"
 
-        # 检查系统和架构的组合
-        if target_os_info in ["win"] and target_arch == "x86_64":
-            target_arch = "amd64"
-        elif target_os_info in ["linux"] and target_arch == "arm64":
-            target_arch = "aarch64"
-        if target_os_info in ["darwin", "macos"]:
-            target_os_info = f"macosx_{'10_9' if target_arch == 'x86_64' else '11_0'}"
-            if target_arch == "aarch64":
-                target_arch = "arm64"
+        if (target_os_info, target_arch) not in BUILD_TARGET:
+            raise ValueError(f"Unsupported target: {target_os_info}, {target_arch}")
 
         # 构建完整的 Wheel 标签
         full_wheel_tag = f"py3-none-{target_os_info}_{target_arch}"
@@ -72,21 +72,13 @@ def initialize(self, version: str, build_data: dict[str, Any]) -> None:
 
     def download_yamlfmt(self, target_os_info: str, target_arch: str) -> None:
         """Download the yamlfmt binary for the specified OS and architecture."""
-        target_os_info_to_go_os = {
-            "macosx_10_9": "Darwin",
-            "macosx_11_0": "Darwin",
-            "win": "Windows",
-        }
-        target_arch_to_go_arch = {
-            "amd64": "x86_64",
-            "aarch64": "arm64",
-        }
-        file_path = self.temp_dir / f"{self.BIN_NAME}_{target_os_info}_{target_arch}.tar.gz"
+        download_target = BUILD_TARGET[(target_os_info, target_arch)]["download_file"]
+        file_path = self.temp_dir / f"{self.BIN_NAME}_{download_target[0]}_{download_target[1]}.tar.gz"
         request.urlretrieve(
             self.YAMLFMT_REPO.format(
                 version=re.sub(r"[ab]\d+$", "", self.metadata.version),  # 去掉版本号中的后缀, alpha/beta
-                target_os_info=target_os_info_to_go_os.get(target_os_info, target_os_info),
-                target_arch=target_arch_to_go_arch.get(target_arch, target_arch),
+                target_os_info=download_target[0],
+                target_arch=download_target[1],
             ),
             file_path,
         )
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "google-yamlfmt"
-version = "0.16.0-alpha.0"
+version = "0.16.0-alpha.1"
 description = "A tool for formatting YAML files, yamlfmt from Google: https://github.com/google/yamlfmt"
 readme = "README.md"
 license = { text = "MIT" }
