summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vincent Rischmann2021-08-18 23:30:53 +0200
committerGravatar GitHub2021-08-18 23:30:53 +0200
commitf5dfcfe2f7a0f40ab5c9b008862e3b6ef20a2f13 (patch)
tree96b71748d26e65155c8021c9072ca23cc26cb4bc
parentMerge pull request #36 from nektro/master (diff)
parentci: stop testing both memory and filesystem (diff)
downloadzig-sqlite-f5dfcfe2f7a0f40ab5c9b008862e3b6ef20a2f13.tar.gz
zig-sqlite-f5dfcfe2f7a0f40ab5c9b008862e3b6ef20a2f13.tar.xz
zig-sqlite-f5dfcfe2f7a0f40ab5c9b008862e3b6ef20a2f13.zip
Merge pull request #38 from vrischmann/ci-macos
enable CI for macOS
-rw-r--r--.builds/alpine-edge-amd64.yml8
-rw-r--r--.builds/debian-stable-aarch64.yml5
-rw-r--r--.builds/debian-stable-amd64.yml8
-rw-r--r--.builds/freebsd-latest-amd64.yml4
-rw-r--r--.github/workflows/main.yml19
-rw-r--r--build.zig8
6 files changed, 12 insertions, 40 deletions
diff --git a/.builds/alpine-edge-amd64.yml b/.builds/alpine-edge-amd64.yml
index 5197bfa..4083853 100644
--- a/.builds/alpine-edge-amd64.yml
+++ b/.builds/alpine-edge-amd64.yml
@@ -25,14 +25,6 @@ tasks:
25 cd zig-sqlite 25 cd zig-sqlite
26 TERM=dumb zig build test -Din_memory=true 26 TERM=dumb zig build test -Din_memory=true
27 27
28 - test_filesystem: |
29 cd zig-sqlite
30 TERM=dumb zig build test -Din_memory=false
31
32 - test_in_memory_with_qemu: | 28 - test_in_memory_with_qemu: |
33 cd zig-sqlite 29 cd zig-sqlite
34 TERM=dumb zig build test -Din_memory=true -Denable_qemu=true 30 TERM=dumb zig build test -Din_memory=true -Denable_qemu=true
35
36 - test_filesystem_with_qemu: |
37 cd zig-sqlite
38 TERM=dumb zig build test -Din_memory=false -Denable_qemu=true
diff --git a/.builds/debian-stable-aarch64.yml b/.builds/debian-stable-aarch64.yml
index bcca906..2c2556d 100644
--- a/.builds/debian-stable-aarch64.yml
+++ b/.builds/debian-stable-aarch64.yml
@@ -15,6 +15,7 @@ tasks:
15 mv ~/zig-linux-* ~/zig-master 15 mv ~/zig-linux-* ~/zig-master
16 echo "export PATH=$PATH:~/zig-master" >> ~/.buildenv 16 echo "export PATH=$PATH:~/zig-master" >> ~/.buildenv
17 17
18 - test_filesystem: | 18 - test_in_memory: |
19 cd zig-sqlite 19 cd zig-sqlite
20 TERM=dumb zig build test -Din_memory=false 20 TERM=dumb zig build test -Din_memory=true
21
diff --git a/.builds/debian-stable-amd64.yml b/.builds/debian-stable-amd64.yml
index 00a2bd2..d8b2337 100644
--- a/.builds/debian-stable-amd64.yml
+++ b/.builds/debian-stable-amd64.yml
@@ -20,14 +20,6 @@ tasks:
20 cd zig-sqlite 20 cd zig-sqlite
21 TERM=dumb zig build test -Din_memory=true 21 TERM=dumb zig build test -Din_memory=true
22 22
23 - test_filesystem: |
24 cd zig-sqlite
25 TERM=dumb zig build test -Din_memory=false
26
27 - test_in_memory_with_qemu: | 23 - test_in_memory_with_qemu: |
28 cd zig-sqlite 24 cd zig-sqlite
29 TERM=dumb zig build test -Din_memory=true -Denable_qemu=true 25 TERM=dumb zig build test -Din_memory=true -Denable_qemu=true
30
31 - test_filesystem_with_qemu: |
32 cd zig-sqlite
33 TERM=dumb zig build test -Din_memory=false -Denable_qemu=true
diff --git a/.builds/freebsd-latest-amd64.yml b/.builds/freebsd-latest-amd64.yml
index e4e344a..0f1c98a 100644
--- a/.builds/freebsd-latest-amd64.yml
+++ b/.builds/freebsd-latest-amd64.yml
@@ -18,7 +18,3 @@ tasks:
18 - test_in_memory: | 18 - test_in_memory: |
19 cd zig-sqlite 19 cd zig-sqlite
20 TERM=dumb zig build test -Din_memory=true 20 TERM=dumb zig build test -Din_memory=true
21
22 - test_filesystem: |
23 cd zig-sqlite
24 TERM=dumb zig build test -Din_memory=false
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 587c172..e1593b4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -29,7 +29,7 @@ jobs:
29 strategy: 29 strategy:
30 fail-fast: false 30 fail-fast: false
31 matrix: 31 matrix:
32 os: [ubuntu-latest, windows-latest] 32 os: [ubuntu-latest, windows-latest, macos-latest]
33 runs-on: ${{ matrix.os }} 33 runs-on: ${{ matrix.os }}
34 steps: 34 steps:
35 - uses: actions/checkout@v2 35 - uses: actions/checkout@v2
@@ -41,20 +41,3 @@ jobs:
41 41
42 - name: Run Tests in memory 42 - name: Run Tests in memory
43 run: zig build test -Din_memory=true 43 run: zig build test -Din_memory=true
44
45 test-with-filesystem:
46 strategy:
47 fail-fast: false
48 matrix:
49 os: [ubuntu-latest, windows-latest]
50 runs-on: ${{ matrix.os }}
51 steps:
52 - uses: actions/checkout@v2
53 with:
54 submodules: true
55 - uses: goto-bus-stop/setup-zig@v1
56 with:
57 version: master
58
59 - name: Run Tests with filesystem
60 run: zig build test -Din_memory=false
diff --git a/build.zig b/build.zig
index 21f09ad..08a1ea9 100644
--- a/build.zig
+++ b/build.zig
@@ -122,6 +122,14 @@ const all_test_targets = switch (std.Target.current.cpu.arch) {
122 .bundled = true, 122 .bundled = true,
123 }, 123 },
124 }, 124 },
125 .macos => [_]TestTarget{
126 TestTarget{
127 .target = .{
128 .cpu_arch = .x86_64,
129 },
130 .bundled = true,
131 },
132 },
125 else => [_]TestTarget{ 133 else => [_]TestTarget{
126 TestTarget{ 134 TestTarget{
127 .target = .{}, 135 .target = .{},