From 90b5fdeede4742e19ab351aa63660e70e60e7273 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 18 Sep 2023 15:46:57 -0700 Subject: [PATCH] ci: don't run gtk tests in CI --- .github/workflows/test.yml | 2 +- nix/devshell.nix | 6 ------ src/apprt.zig | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b3ac1492e..5bbea409b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -87,7 +87,7 @@ jobs: nix_path: nixpkgs=channel:nixos-unstable - name: test - run: nix develop -c zig build test + run: nix develop -c zig build -Dapp-runtime=none test - name: Test GTK Build run: nix develop -c zig build -Dapp-runtime=gtk diff --git a/nix/devshell.nix b/nix/devshell.nix index bda7efe55..d8995e189 100644 --- a/nix/devshell.nix +++ b/nix/devshell.nix @@ -1,8 +1,6 @@ { mkShell, lib, stdenv , bashInteractive -, debugedit -, flatpak-builder , gdb , glxinfo , ncurses @@ -92,10 +90,6 @@ in mkShell rec { # by default so we have to include this. bashInteractive - # Flatpak builds - debugedit - flatpak-builder - gdb valgrind wraptest diff --git a/src/apprt.zig b/src/apprt.zig index e979588a9..50e8a6ba7 100644 --- a/src/apprt.zig +++ b/src/apprt.zig @@ -25,7 +25,7 @@ pub const surface = @import("apprt/surface.zig"); /// Window or something. pub const runtime = switch (build_config.artifact) { .exe => switch (build_config.app_runtime) { - .none => @compileError("exe with no runtime not allowed"), + .none => struct {}, .glfw => glfw, .gtk => gtk, },