Skip to content

Commit

Permalink
remove sentry test for macOS, remove windows check
Browse files Browse the repository at this point in the history
  • Loading branch information
mitchellh committed Jan 2, 2025
1 parent cb8d30f commit 7a5ef3d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 29 deletions.
27 changes: 1 addition & 26 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
};
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 7a5ef3d

Please sign in to comment.