mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(nix/buildkite): drop postBuild logic

Browse source 
This has been scheduled for removal in 2022-10-01, but it didn't happen
so far. Let's remove it now, better late than never.

Closes https://b.tvl.fyi/issues/286.

Change-Id: I26fe07360c694c1c93418f3310b4067051e08c87
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8969
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Florian Klink 2023-07-14 18:53:55 +03:00 committed by clbot
parent 57bab040ed
commit 6c630aadc8
1 changed files with 2 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
nix/buildkite/default.nix
View file

@ -278,10 +278,6 @@ rec {
# confirmation. These steps always run after the main build is # confirmation. These steps always run after the main build is
# done and have no influence on CI status. # done and have no influence on CI status.
# #
# postBuild (optional): If set to true, this step will run after
# all primary build steps (that is, after status has been reported
# back to CI).
#
# needsOutput (optional): If set to true, the parent derivation # needsOutput (optional): If set to true, the parent derivation
# will be built in the working directory before running the # will be built in the working directory before running the
# command. Output will be available as 'result'. # command. Output will be available as 'result'.
@ -332,12 +328,7 @@ rec {
, alwaysRun ? false , alwaysRun ? false
, prompt ? false , prompt ? false
, softFail ? false , softFail ? false
, phase ? "build"
# TODO(tazjin): Default to 'build' after 2022-10-01.
, phase ? if (isNull postBuild || !postBuild) then "build" else "release"
# TODO(tazjin): Turn into hard-failure after 2022-10-01.
, postBuild ? null
, skip ? false , skip ? false
, agents ? null , agents ? null
}: }:
@ -368,27 +359,7 @@ rec {
skip skip
agents; agents;
# //nix/buildkite is growing a new feature for adding different phase = validPhase;
# "build phases" which supersedes the previous `postBuild`
# boolean API.
#
# To help users transition, emit warnings if the old API is used.
phase = lib.warnIfNot (isNull postBuild) ''
In step '${label}' (from ${parentLabel}):
Please note: The CI system is introducing support for running
steps in different build phases.
The currently supported phases are 'build' (all Nix targets,
extra steps such as tests that feed into the build results,
etc.) and 'release' (steps that run after builds and tests
have already completed).
This replaces the previous boolean `postBuild` API in extra
step definitions. Please remove the `postBuild` parameter from
this step and instead set `phase = "${phase}";`.
''
validPhase;
prompt = lib.throwIf (prompt != false && phase == "build") '' prompt = lib.throwIf (prompt != false && phase == "build") ''
In step '${label}' (from ${parentLabel}): In step '${label}' (from ${parentLabel}):