From ddfb1dec4b448f95898c3cfe0f4d1a14fa3c266e Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sat, 15 Oct 2022 15:00:41 -0700 Subject: [PATCH] Switch to stage2 primarily for builds --- .github/workflows/test.yml | 5 +---- Makefile | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 53af2d932..e1ac39933 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,9 +38,6 @@ jobs: # Cross-compile the binary. We always use static building for this # because its the only way to access the headers. - name: Test Build - run: nix develop -c zig build -fstage1 -Dstatic=true -Dtarget=${{ matrix.target }} - - - name: Test Build stage2 run: nix develop -c zig build -Dstatic=true -Dtarget=${{ matrix.target }} test: @@ -67,5 +64,5 @@ jobs: run: nix develop -c zig build test - name: Test Dynamic Build - run: nix develop -c zig build -fstage1 -Dstatic=false + run: nix develop -c zig build -Dstatic=false diff --git a/Makefile b/Makefile index b075cc164..e36a844dd 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ init: # Slightly cursed way that we setup a dev version of this locally on NixOS. dev/install: - zig build -fstage1 -Dcpu=baseline -Drelease-fast + zig build -Dcpu=baseline -Drelease-fast if [ -f "/etc/NIXOS" ]; then patchelf --set-rpath "${LD_LIBRARY_PATH}" zig-out/bin/ghostty; fi mkdir -p ${HOME}/bin cp zig-out/bin/ghostty ${HOME}/bin/devtty