From fce02ee0b819e7bc340ae8b85d0dcf3d383110fa Mon Sep 17 00:00:00 2001 From: Simon Richter Date: Thu, 6 Jul 2023 14:56:21 +0900 Subject: [PATCH] Do not fail formatting test when reusing a build env --- .gitlab/mr_formatting.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab/mr_formatting.yml b/.gitlab/mr_formatting.yml index 95e5c4581d..ad01074d19 100644 --- a/.gitlab/mr_formatting.yml +++ b/.gitlab/mr_formatting.yml @@ -12,8 +12,10 @@ test_formatting: allow_failure: true before_script: # We must manually add the KiCad remote to ensure it is named sensibly - - git remote add product https://gitlab.com/kicad/code/kicad.git - - git remote add source ${CI_MERGE_REQUEST_SOURCE_PROJECT_URL}.git + - git remote add product https://gitlab.com/kicad/code/kicad.git || + git remote set-url product https://gitlab.com/kicad/code/kicad.git + - git remote add source ${CI_MERGE_REQUEST_SOURCE_PROJECT_URL}.git || + git remote set-url source ${CI_MERGE_REQUEST_SOURCE_PROJECT_URL}.git - git fetch -n product - git fetch -n source # Get the SHAs of the commits