daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-11-05 06:03:15 -06:00
Code Issues Projects Releases Packages Wiki Activity

don't use multiline log in ci since no lix

Browse source
This commit is contained in:
Daylin Morgan 2024-07-01 10:50:53 -05:00
parent 2160a0d184
commit 6efe35770f
Signed by: daylin
GPG key ID: 950D13E9719334AD
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/build.yml vendored
View file

@ -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: |

6
pkgs/oizys/internal/oizys/main.go
View file

@ -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)
}