From 7eb4a6fe2b2e3b22bdd8d19cb15512b692353fbd Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Mon, 7 Oct 2024 17:54:08 +0200 Subject: [PATCH] cirrus: speed up postbuild In particular the main build task already did a make vendor and a regeneration of the completion scripts. This means the first tre_status would pick up both changes so the suggestion would be off. And rerunning the same thing again here just makes thing slower than they need to be. In particular there was the bug that make completion even rebuild podman because generate-bindings obviously updates the timestamps of the files as they are overwritten. We do however must run generate-bindings as it was not run before. Signed-off-by: Paul Holzinger --- contrib/cirrus/postbuild.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/cirrus/postbuild.sh b/contrib/cirrus/postbuild.sh index ef6e89797f..18150e9dac 100755 --- a/contrib/cirrus/postbuild.sh +++ b/contrib/cirrus/postbuild.sh @@ -30,13 +30,13 @@ source $AUTOMATION_LIB_PATH/common_lib.sh # shellcheck disable=SC2154 cd $CIRRUS_WORKING_DIR +# Note, make completions and make vendor will already be run in _run_build() +# so do not run them again for no reason. This just makes CI slower. +SUGGESTION="run 'make vendor' or 'make completions' and commit all changes" ./hack/tree_status.sh + showrun make .install.goimports -showrun make vendor -SUGGESTION="run 'make vendor' and commit all changes" ./hack/tree_status.sh showrun make generate-bindings SUGGESTION="run 'make generate-bindings' and commit all changes" ./hack/tree_status.sh -showrun make completions -SUGGESTION="run 'make completions' and commit all changes" ./hack/tree_status.sh # Defined in Cirrus-CI config. # shellcheck disable=SC2154