[tracker/wip/carlosg/code-style-checks] bar




commit 502f90f924676e33a1cb832d32fea447b3321643
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Jun 14 01:21:43 2021 +0200

    bar

 .gitlab-ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0a63c3ef..f6e4aefac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -181,11 +181,15 @@ check-code-style:
     - build-fedora-container@x86_64
   stage: code-review
   script:
-    - export common_parent_sha=$(diff --old-line-format='' --new-line-format='' <(git rev-list 
--first-parent "origin/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}") <(git rev-list 
--first-parent HEAD) | head -1) ;
+    - git fetch origin ;
+      export common_parent_sha=$(diff --old-line-format='' --new-line-format='' <(git rev-list 
--first-parent "origin/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}") <(git rev-list 
--first-parent HEAD) | head -1) ;
+      echo $common_parent_sha ;
       ./check-style.py --sha $common_parent_sha ;
       if [ $? -ne 0 ] ;
       then
         echo -e "Issue the following command in your local tree to apply the suggested changes (needs 
uncrustify installed):\n\n $ git rebase "origin/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}" 
--exec \"./check-style.py -r\" \n" ;
+      else
+        echo -e "All looks good.\n"
       fi
   allow_failure: true
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]