From 6efe35770fa92cbb6293cf56afc5f53af09046a2 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Mon, 1 Jul 2024 10:50:53 -0500 Subject: [PATCH] don't use multiline log in ci since no lix --- .github/workflows/build.yml | 10 ---------- pkgs/oizys/internal/oizys/main.go | 6 ++++-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a54c734..1cacf88 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,16 +44,6 @@ jobs: name: daylin authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - - name: Swap Lix for nix - run: | - which nix - sudo nix run \ - --experimental-features "nix-command flakes" \ - --extra-substituters https://cache.lix.systems --extra-trusted-public-keys "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" \ - 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90.0-rc1' -- \ - upgrade-nix \ - --extra-substituters https://cache.lix.systems --extra-trusted-public-keys "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" - - name: write lock file if: "${{ inputs.lockFile != '' }}" run: | diff --git a/pkgs/oizys/internal/oizys/main.go b/pkgs/oizys/internal/oizys/main.go index 983a834..54a7821 100644 --- a/pkgs/oizys/internal/oizys/main.go +++ b/pkgs/oizys/internal/oizys/main.go @@ -259,7 +259,9 @@ func NixosRebuild(subcmd string, rest ...string) { "--flake", o.flake, ) - cmd.Args = append(cmd.Args, "--log-format", "multiline") + if !o.inCI { + cmd.Args = append(cmd.Args, "--log-format", "multiline") + } if o.verbose { cmd.Args = append(cmd.Args, "--print-build-logs") } @@ -290,7 +292,7 @@ func NixBuild(nom bool, minimal bool, rest ...string) { } cmd.Args = append(cmd.Args, drvs...) } - cmd.Args = append(cmd.Args, "--log-format", "multiline") + cmd.Args = append(cmd.Args, "--log-format", "multiline") cmd.Args = append(cmd.Args, rest...) exitWithCommand(cmd) }