[gimp] gitlab-ci: gimp-distcheck-debian and gimp-autotools-debian redundant.



commit de31d65daa1150cf559054cb2a4d4c661163d637
Author: Jehan <jehan girinstud io>
Date:   Fri May 14 19:56:55 2021 +0200

    gitlab-ci: gimp-distcheck-debian and gimp-autotools-debian redundant.
    
    We had an autotools build stopping at `make check` and a separate one
    for `make distcheck`. This just seems very redundant hence a waste of
    resources.
    So let's drop the job gimp-autotools-debian then add a `make check` step
    to gimp-distcheck-debian.
    
    Also as a side change, I move the cppcheck to being a scheduled job.
    It's not such resource intensive job, nor did it take much time, yet
    it's not like we use this information constantly. Moreover it never
    fails anyway (so it's not like it gives much information on a per-commit
    basis, unless we explicitly look into the resulting files) and with the
    ability to run custom jobs whenever we want, this is far enough if
    sometimes we need to generate the cppcheck analysis more frequently.
    The rest of the time, having 2 jobs of this a week (our current
    schedule) is far enough.

 .gitlab-ci.yml | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e66bc1a4c9..ebc151ce6f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -151,19 +151,6 @@ deps-debian:
     - export PATH="${INSTALL_PREFIX}/bin:$PATH"
   needs: ["deps-debian"]
 
-gimp-autotools-debian:
-  except:
-    - schedules
-  extends: .gimp-debian-base
-  script:
-    - mkdir _build
-    - cd _build
-    - ../autogen.sh
-        --prefix="${INSTALL_PREFIX}"
-        --enable-debug
-    - make -j "$(nproc)"
-    - make check
-
 gimp-distcheck-debian:
   except:
     - schedules
@@ -176,6 +163,7 @@ gimp-distcheck-debian:
         --enable-debug
         --enable-gtk-doc
     - make -j "$(nproc)"
+    - make -j "$(nproc)" check
     - make -j "$(nproc)" distcheck
 
 gimp-meson-debian:
@@ -425,8 +413,8 @@ gimp-win32:
       - gimp-prefix/
 
 cppcheck:
-  except:
-    - schedules
+  rules:
+    - if: '$CI_COMMIT_TAG == null && $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_CPPCHECK != null'
   stage: analysis
   before_script:
     - apt-get update


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