From a28cc94aa0b32e402b900965db147a5cb4a8835f Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Mon, 29 Jan 2024 16:30:30 +0100 Subject: [PATCH] ci/everycommit: adjust "git status" call to investigate build failures This is a more useful version of of 9b16ce355debd105b65bb841b300e585e80aefad. This allows to diagnose errors like forgetting to update Cargo.lock when Cargo.toml is updated, as errors is reported by git-rebase before a second `--exec` can be run. Signed-off-by: Yann Dirson --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d4d164..d48b649 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -183,8 +183,7 @@ build-linux-everycommit: # to switch a PR back to draft, mitigating the risk to push a # failing commit) - git rebase --rebase-merges $CI_MERGE_REQUEST_DIFF_BASE_SHA - --exec 'devscripts/gitlab-ci-runbuild.sh cargo build ${FEATURES} ${CARGO_FLAGS}' - --exec 'git status' + --exec 'devscripts/gitlab-ci-runbuild.sh cargo build ${FEATURES} ${CARGO_FLAGS} && git status' after_script: # since Git Strategy is "fetch", avoid poluting subsequent runs # (but as of v16.9 it still won't be run on timeout or cancel) -- 2.39.5