auxolotl/buildbot-nix
26
1
Fork 0
Code Issues Pull requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #38 from Mic92/fixes

Browse source 
fix conditionals when skipping cached builds
This commit is contained in:
Jörg Thalheim 2023-11-18 07:10:24 +01:00 committed by GitHub
parent f159440830 392329ea71
commit 0c087c78a6
Failed to generate hash of commit
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
buildbot_nix/__init__.py
View file

@ -528,7 +528,7 @@ def nix_build_config(
util.Secret("cachix-name"), util.Secret("cachix-name"),
util.Interpolate("result-%(prop:attr)s"), util.Interpolate("result-%(prop:attr)s"),
], ],
doStepIf=lambda s: s.getProperty("isCached"), doStepIf=lambda s: not s.getProperty("is_cached"),
) )
) )
@ -545,8 +545,8 @@ def nix_build_config(
"-r", "-r",
util.Property("out_path"), util.Property("out_path"),
], ],
doStepIf=lambda s: s.getProperty("isCached") doStepIf=lambda s: not s.getProperty("is_cached")
or s.getProperty("branch") and s.getProperty("branch")
== s.getProperty("github.repository.default_branch"), == s.getProperty("github.repository.default_branch"),
) )
) )
@ -554,7 +554,7 @@ def nix_build_config(
steps.ShellCommand( steps.ShellCommand(
name="Delete temporary gcroots", name="Delete temporary gcroots",
command=["rm", "-f", util.Interpolate("result-%(prop:attr)s")], command=["rm", "-f", util.Interpolate("result-%(prop:attr)s")],
doStepIf=lambda s: s.getProperty("isCached"), doStepIf=lambda s: not s.getProperty("is_cached"),
) )
) )
if outputs_path is not None: if outputs_path is not None: