mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-22 18:30:43 -06:00
don't use multiline log in ci since no lix
This commit is contained in:
parent
2160a0d184
commit
6efe35770f
2 changed files with 4 additions and 12 deletions
10
.github/workflows/build.yml
vendored
10
.github/workflows/build.yml
vendored
|
@ -44,16 +44,6 @@ jobs:
|
||||||
name: daylin
|
name: daylin
|
||||||
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
|
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
|
- name: write lock file
|
||||||
if: "${{ inputs.lockFile != '' }}"
|
if: "${{ inputs.lockFile != '' }}"
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -259,7 +259,9 @@ func NixosRebuild(subcmd string, rest ...string) {
|
||||||
"--flake",
|
"--flake",
|
||||||
o.flake,
|
o.flake,
|
||||||
)
|
)
|
||||||
|
if !o.inCI {
|
||||||
cmd.Args = append(cmd.Args, "--log-format", "multiline")
|
cmd.Args = append(cmd.Args, "--log-format", "multiline")
|
||||||
|
}
|
||||||
if o.verbose {
|
if o.verbose {
|
||||||
cmd.Args = append(cmd.Args, "--print-build-logs")
|
cmd.Args = append(cmd.Args, "--print-build-logs")
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue