From d9d13906e1505ce2e51cb2bc5fb59b26e378a629 Mon Sep 17 00:00:00 2001 From: Vincent Rischmann Date: Tue, 16 Apr 2024 22:06:21 +0200 Subject: build: revamp all test argets --- build.zig | 141 +++++++++++--------------------------------------------------- 1 file changed, 25 insertions(+), 116 deletions(-) diff --git a/build.zig b/build.zig index b0e67f0..a107bd5 100644 --- a/build.zig +++ b/build.zig @@ -54,134 +54,43 @@ const ci_targets = switch (builtin.target.cpu.arch) { const all_test_targets = switch (builtin.target.cpu.arch) { .x86_64 => switch (builtin.target.os.tag) { .linux => [_]TestTarget{ - // Targets linux but other CPU archs. - TestTarget{ - .query = .{}, - .bundled = false, - }, - TestTarget{ - .query = .{ - .cpu_arch = .x86_64, - .abi = .musl, - }, - .bundled = true, - }, - TestTarget{ - .query = .{ - .cpu_arch = .x86, - .abi = .musl, - }, - .bundled = true, - }, - TestTarget{ - .query = .{ - .cpu_arch = .aarch64, - .abi = .musl, - }, - .bundled = true, - }, - TestTarget{ - .query = .{ - .cpu_arch = .riscv64, - .abi = .musl, - }, - .bundled = true, - }, - TestTarget{ - .query = .{ - .cpu_arch = .mips, - .abi = .musl, - }, - .bundled = true, - }, - // TODO(vincent): failing for some time for unknown reasons - // TestTarget{ - // .query =.{ - // .cpu_arch = .arm, - // .abi = .musleabihf, - // }, - // .bundled = true, - // }, - // Targets windows - TestTarget{ - .query = .{ - .cpu_arch = .x86_64, - .os_tag = .windows, - }, - .bundled = true, - }, - TestTarget{ - .query = .{ - .cpu_arch = .x86, - .os_tag = .windows, - }, - .bundled = true, - }, - // Targets macOS - TestTarget{ - .query = .{ - .cpu_arch = .x86_64, - .os_tag = .macos, - }, - .bundled = true, - }, - TestTarget{ - .query = .{ - .cpu_arch = .aarch64, - .os_tag = .macos, - }, - .bundled = true, - }, + TestTarget{ .query = .{}, .bundled = false }, + TestTarget{ .query = .{ .cpu_arch = .x86_64, .abi = .musl }, .bundled = true }, + TestTarget{ .query = .{ .cpu_arch = .x86, .abi = .musl }, .bundled = true }, + TestTarget{ .query = .{ .cpu_arch = .aarch64, .abi = .musl }, .bundled = true }, + TestTarget{ .query = .{ .cpu_arch = .riscv64, .abi = .musl }, .bundled = true }, + TestTarget{ .query = .{ .cpu_arch = .mips, .abi = .musl }, .bundled = true }, + TestTarget{ .query = .{ .cpu_arch = .x86_64, .os_tag = .windows }, .bundled = true }, + TestTarget{ .query = .{ .cpu_arch = .x86, .os_tag = .windows }, .bundled = true }, + TestTarget{ .query = .{ .cpu_arch = .x86_64, .os_tag = .macos }, .bundled = true }, + TestTarget{ .query = .{ .cpu_arch = .aarch64, .os_tag = .macos }, .bundled = true }, }, .windows => [_]TestTarget{ - TestTarget{ - .query = .{ - .cpu_arch = .x86_64, - .abi = .gnu, - }, - .bundled = true, - }, - TestTarget{ - .query = .{ - .cpu_arch = .x86, - .abi = .gnu, - }, - .bundled = true, - }, + TestTarget{ .query = .{ .cpu_arch = .x86_64, .abi = .gnu }, .bundled = true }, + TestTarget{ .query = .{ .cpu_arch = .x86, .abi = .gnu }, .bundled = true }, }, .freebsd => [_]TestTarget{ - TestTarget{ - .query = .{}, - .bundled = false, - }, - TestTarget{ - .query = .{ - .cpu_arch = .x86_64, - }, - .bundled = true, - }, + TestTarget{ .query = .{}, .bundled = false }, + TestTarget{ .query = .{ .cpu_arch = .x86_64 }, .bundled = true }, }, .macos => [_]TestTarget{ - TestTarget{ - .query = .{ - .cpu_arch = .x86_64, - }, - .bundled = true, - }, + TestTarget{ .query = .{ .cpu_arch = .x86_64 }, .bundled = true }, }, else => [_]TestTarget{ - TestTarget{ - .query = .{}, - .bundled = false, - }, + TestTarget{ .query = .{}, .bundled = false }, }, }, - else => [_]TestTarget{ - TestTarget{ - .query = .{}, - .bundled = false, + .aarch64 => switch (builtin.target.os.tag) { + .linux, .windows, .freebsd, .macos => [_]TestTarget{ + TestTarget{ .query = .{}, .bundled = true }, + }, + else => [_]TestTarget{ + TestTarget{ .query = .{}, .bundled = false }, }, }, + else => [_]TestTarget{ + TestTarget{ .query = .{}, .bundled = false }, + }, }; fn computeTestTargets(isNative: bool, ci: ?bool) ?[]const TestTarget { -- cgit v1.2.3 From 97dc032be86d47f6840af823932b168a8109aa01 Mon Sep 17 00:00:00 2001 From: Vincent Rischmann Date: Tue, 16 Apr 2024 22:06:21 +0200 Subject: ci: don't use -frosetta --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6a6093c..d97177c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,7 +61,7 @@ jobs: run: zig build test -Dci=true -Din_memory=true --summary all -fqemu -fwine - name: Run Tests in memory if: ${{ matrix.os == 'macos-latest' }} - run: zig build test -Dci=true -Din_memory=true --summary all -frosetta + run: zig build test -Dci=true -Din_memory=true --summary all - name: Run Tests in memory if: ${{ matrix.os == 'windows-latest' }} run: zig build test -Dci=true -Din_memory=true --summary all -- cgit v1.2.3 From 0171d3ed0cc5c9a85e982af20add8951de467b0b Mon Sep 17 00:00:00 2001 From: Vincent Rischmann Date: Tue, 16 Apr 2024 22:10:39 +0200 Subject: build: macos on GitHub Actions is actually x86_64 --- build.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.zig b/build.zig index a107bd5..454a968 100644 --- a/build.zig +++ b/build.zig @@ -44,7 +44,7 @@ const ci_targets = switch (builtin.target.cpu.arch) { TestTarget{ .query = .{ .cpu_arch = .x86, .abi = .gnu }, .bundled = true }, }, .macos => [_]TestTarget{ - TestTarget{ .query = .{ .cpu_arch = .aarch64 }, .bundled = true }, + TestTarget{ .query = .{ .cpu_arch = .x86_64 }, .bundled = true }, }, else => unreachable, }, -- cgit v1.2.3 From a5197ef5b596eaffbd0c2ed44e7b98af2a73e93c Mon Sep 17 00:00:00 2001 From: Vincent Rischmann Date: Tue, 16 Apr 2024 22:27:08 +0200 Subject: ci: run the loadable extension test in another job --- .github/workflows/main.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d97177c..1c71a57 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,14 +60,21 @@ jobs: if: ${{ matrix.os == 'ubuntu-latest' }} run: zig build test -Dci=true -Din_memory=true --summary all -fqemu -fwine - name: Run Tests in memory - if: ${{ matrix.os == 'macos-latest' }} - run: zig build test -Dci=true -Din_memory=true --summary all - - name: Run Tests in memory - if: ${{ matrix.os == 'windows-latest' }} + if: ${{ matrix.os != 'ubuntu-latest' }} run: zig build test -Dci=true -Din_memory=true --summary all + test-loadable-extension: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Setup zig + uses: goto-bus-stop/setup-zig@v2 + with: + version: master + - name: Build the example zigcrypto loadable extension run: zig build zigcrypto - name: Test the zigcrypto loadable extension - if: ${{ matrix.os != 'windows-latest' }} run: ./zig-out/bin/zigcrypto-test -- cgit v1.2.3 From 31ecdc898c195a9f413fdecb7497693572c2dad3 Mon Sep 17 00:00:00 2001 From: Vincent Rischmann Date: Tue, 16 Apr 2024 22:27:22 +0200 Subject: ci: don't need submodules --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1c71a57..8d3162e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,8 +34,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - with: - submodules: true - name: Setup zig uses: goto-bus-stop/setup-zig@v2 -- cgit v1.2.3