use cpu baseline

Author: jiacai2050

.github/build-release.sh

@@ -25,6 +25,7 @@ targets=(
   # "aarch64-macos"
   "x86_64-macos"
   "x86_64-windows"
+  "aarch64-windows"
 )
 
 export BUILD_DATE=$(date +'%Y-%m-%dT%H:%M:%S%z')
@@ -36,8 +37,9 @@ for target in "${targets[@]}"; do
   dst_dir=zig-out/${filename}
 
   # 1. Build
+  # baseline is required, see https://github.com/jiacai2050/zigcli/issues/43
   zig build -Doptimize=ReleaseSafe -Dtarget="${target}" -p ${dst_dir} \
-      -Dvendor-libcurl=true -Dgit_commit=${GIT_COMMIT} -Dbuild_date=${BUILD_DATE}
+      -Dcpu=baseline -Dgit_commit=${GIT_COMMIT} -Dbuild_date=${BUILD_DATE}
 
   # 2. Prepare files
   rm -f ${dst_dir}/bin/*demo

.github/workflows/CI.yml

@@ -43,10 +43,6 @@ jobs:
           zig.exe fmt --check .
           zig.exe build test
           zig.exe build
-      - name: deps(ubuntu)
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          sudo apt update && sudo apt-get install -y libcurl4-openssl-dev
       - name: fmt and test(unix)
         if: matrix.os != 'windows-latest'
         run: |
@@ -72,10 +68,6 @@ jobs:
       - uses: mlugg/setup-zig@v1
         with:
           version: 0.14.0
-      - name: deps(ubuntu)
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          sudo apt update && sudo apt-get install -y libcurl4-openssl-dev
       - name: Build
         run: |
-          zig build -Dtarget=${{ matrix.targets }} -Dskip-zigfetch=true
+          zig build -Dtarget=${{ matrix.targets }}

.github/workflows/release.yml

@@ -51,7 +51,6 @@ jobs:
       - name: Build(Ubuntu)
         if: matrix.os == 'ubuntu-latest'
         run: |
-          sudo apt update && sudo apt-get install -y libcurl4-openssl-dev
           bash .github/build-release.sh
       - name: Build(MacOS)
         if: matrix.os == 'macos-latest'

build.zig

@@ -6,12 +6,10 @@ const macos_private_framework = "/Applications/Xcode.app/Contents/Developer/Plat
 pub fn build(b: *Build) !void {
     const optimize = b.standardOptimizeOption(.{});
     const target = b.standardTargetOptions(.{});
-    const skip_zigfetch = b.option(bool, "skip-zigfetch", "Skip zig fetch") orelse false;
-    const vendor_libcurl = b.option(bool, "vendor-libcurl", "Static link libcurl") orelse false;
     var all_tests = std.ArrayList(*Build.Step).init(b.allocator);
 
     try addModules(b, target, optimize, &all_tests);
-    try buildBinaries(b, optimize, target, &all_tests, skip_zigfetch, vendor_libcurl);
+    try buildBinaries(b, optimize, target, &all_tests);
     try buildExamples(b, optimize, target, &all_tests);
 
     const test_all_step = b.step("test", "Run all tests");
@@ -102,7 +100,7 @@ fn buildExamples(
         "simargs-demo",
         "pretty-table-demo",
     }) |name| {
-        try buildBinary(b, .{ .ex = name }, optimize, target, all_tests, false, false);
+        try buildBinary(b, .{ .ex = name }, optimize, target, all_tests);
     }
 }
 
@@ -111,8 +109,6 @@ fn buildBinaries(
     optimize: std.builtin.Mode,
     target: std.Build.ResolvedTarget,
     all_tests: *std.ArrayList(*Build.Step),
-    skip_zigfetch: bool,
-    vendor_libcurl: bool,
 ) !void {
     inline for (.{
         "zigfetch",
@@ -132,8 +128,6 @@ fn buildBinaries(
             optimize,
             target,
             all_tests,
-            skip_zigfetch,
-            vendor_libcurl,
         );
     }
 
@@ -147,16 +141,12 @@ fn buildBinary(
     optimize: std.builtin.Mode,
     target: std.Build.ResolvedTarget,
     all_tests: *std.ArrayList(*Build.Step),
-    skip_zigfetch: bool,
-    vendor_libcurl: bool,
 ) !void {
     if (makeCompileStep(
         b,
         source,
         optimize,
         target,
-        skip_zigfetch,
-        vendor_libcurl,
     )) |exe| {
         var deps = b.modules.iterator();
         while (deps.next()) |dep| {
@@ -200,8 +190,6 @@ fn makeCompileStep(
     comptime source: Source,
     optimize: std.builtin.Mode,
     target: std.Build.ResolvedTarget,
-    skip_zigfetch: bool,
-    vendor_libcurl: bool,
 ) ?*Build.Step.Compile {
     const name = comptime source.name();
     const path = comptime source.path();
@@ -236,28 +224,13 @@ fn makeCompileStep(
         }
         exe.linkLibC();
     } else if (std.mem.eql(u8, name, "zigfetch")) {
-        if (skip_zigfetch) {
-            return null;
-        }
-        const host_os = @import("builtin").os.tag;
-        const build_os = target.result.os.tag;
-        if (host_os != build_os) { // don't support cross compile
-            return null;
-        }
-        if (host_os == .linux or host_os == .macos) {
-            const dep_curl = b.dependency("curl", .{
-                .link_vendor = vendor_libcurl,
-                .target = target,
-                .optimize = optimize,
-            });
-            if (!vendor_libcurl) {
-                exe.linkSystemLibrary("curl");
-            }
-            exe.root_module.addImport("curl", dep_curl.module("curl"));
-            exe.linkLibC();
-        } else {
-            return null;
-        }
+        const dep_curl = b.dependency("curl", .{
+            .link_vendor = true,
+            .target = target,
+            .optimize = optimize,
+        });
+        exe.root_module.addImport("curl", dep_curl.module("curl"));
+        exe.linkLibC();
     } else if (std.mem.eql(u8, name, "pidof")) {
         // only build for macOS
         if (is_darwin) {