summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchell Hashimoto <m@mitchellh.com>2025-01-02 13:34:11 -0800
committerMitchell Hashimoto <m@mitchellh.com>2025-01-02 13:34:23 -0800
commit7a5ef3da2b4fe39cf25919dd451d3adb88ed883e (patch)
treed2d5114a74731b349debe89fc024e9f327c53781
parentcb8d30f938e873f1d14485bc10bf7ebd201cd436 (diff)
remove sentry test for macOS, remove windows check
-rw-r--r--.github/workflows/test.yml27
-rw-r--r--build.zig7
2 files changed, 5 insertions, 29 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8aa147935..41bc58925 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -381,7 +381,7 @@ jobs:
fail-fast: false
matrix:
sentry: ["true", "false"]
- name: Build -Dsentry=${{ matrix.sentry }} on Linux
+ name: Build -Dsentry=${{ matrix.sentry }}
runs-on: namespace-profile-ghostty-sm
needs: test
env:
@@ -411,31 +411,6 @@ jobs:
run: |
nix develop -c zig build -Dsentry=${{ matrix.sentry }}
- test-sentry-macos:
- strategy:
- fail-fast: false
- matrix:
- sentry: ["true", "false"]
- name: Build -Dsentry=${{ matrix.sentry }} on macOS
- runs-on: namespace-profile-ghostty-macos
- needs: test
- steps:
- - name: Checkout code
- uses: actions/checkout@v4
-
- # Install Nix and use that to run our tests so our environment matches exactly.
- - uses: cachix/install-nix-action@v30
- with:
- nix_path: nixpkgs=channel:nixos-unstable
- - uses: cachix/cachix-action@v15
- with:
- name: ghostty
- authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-
- - name: Test Sentry Build
- run: |
- nix develop -c zig build -Dsentry=${{ matrix.sentry }}
-
test-macos:
runs-on: namespace-profile-ghostty-macos
needs: test
diff --git a/build.zig b/build.zig
index ac664deb7..2a2eda794 100644
--- a/build.zig
+++ b/build.zig
@@ -159,6 +159,9 @@ pub fn build(b: *std.Build) !void {
) orelse sentry: {
switch (target.result.os.tag) {
.macos, .ios => break :sentry true,
+
+ // Note its false for linux because the crash reports on Linux
+ // don't have much useful information.
else => break :sentry false,
}
};
@@ -1256,9 +1259,7 @@ fn addDeps(
}
// Sentry
- if (config.sentry) sentry: {
- if (target.result.os.tag == .windows) break :sentry;
-
+ if (config.sentry) {
const sentry_dep = b.dependency("sentry", .{
.target = target,
.optimize = optimize,