[gnome-build-meta/abderrahim/strict] .gitlab-ci.yml: remove mentions of strict/non-strict mode




commit e621b2cd092fed0b702be7537818532a03f312db
Author: Abderrahim Kitouni <abderrahim kitouni codethink co uk>
Date:   Wed Oct 5 12:08:12 2022 +0200

    .gitlab-ci.yml: remove mentions of strict/non-strict mode
    
    We'll only use strict mode from now on
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1799>

 .gitlab-ci.yml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a990202c4..db9dc2d7d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,10 +2,9 @@ include: .gitlab-ci/arch.yml
 
 variables:
   GET_SOURCES_ATTEMPTS: 3
-  BST_STRICT: '--no-strict'
   BST_TRACK_TAGS: 'false'
-  BST_NO_PUSH: "bst $BST_STRICT --config .gitlab-ci/buildstream-nopush.conf --log-file logs/build.log 
--colors"
-  BST: "bst $BST_STRICT --config .gitlab-ci/buildstream.conf --log-file logs/build.log --colors"
+  BST_NO_PUSH: "bst --config .gitlab-ci/buildstream-nopush.conf --log-file logs/build.log --colors"
+  BST: "bst --config .gitlab-ci/buildstream.conf --log-file logs/build.log --colors"
   FLATPAK_BRANCH: master
   OPENQA_HOST: https://openqa.gnome.org
   OPENQA_NEEDLES_GIT: https://gitlab.gnome.org/gnome/openqa-needles
@@ -66,14 +65,7 @@ default:
          ;;
     esac
 
-  - |
-    if test $FLATPAK_BRANCH == 'master' &&
-        git diff --name-only origin/master | egrep -q "junction.refs|freedestkop-sdk.bst"; then
-      echo Forcing strict build
-      FORCE_STRICT=--strict
-    fi
-
-  - ${BST} ${FORCE_STRICT} --max-jobs $(( $(nproc) / 4 )) -o arch "${ARCH}" build "${TARGETS[@]}"
+  - ${BST} --max-jobs $(( $(nproc) / 4 )) -o arch "${ARCH}" build "${TARGETS[@]}"
 
   # Store artifacts so we can inspect build failures
   artifacts:


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