[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX] CI: fix job to check usage of ^ operator when jq is missing

Benoit Grégoire pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
d6e44d42 by Landry Bitege at 2025-09-19T15:51:06+00:00
[FIX] CI: fix job to check usage of ^ operator when jq is missing
---
* [FIX] CI : fix job to check usage of ^ operator when jq is missing

See merge request tikiwiki/tiki!8601

- - - - -


4 changed files:

- .gitlab-ci.yml
- doc/devtools/check_caret_operator.sh
- vendor_bundled/composer.json
- vendor_bundled/composer.lock


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -721,6 +721,7 @@ composer-operator-check:
   needs:
     - composer
   script:
+  - apt-get update && apt-get install -y jq
   - chmod +x doc/devtools/check_caret_operator.sh
   - ./doc/devtools/check_caret_operator.sh
   rules:


=====================================
doc/devtools/check_caret_operator.sh
=====================================
@@ -6,6 +6,11 @@ set -e
 # https://gitlab.com/tikiwiki/tiki/-/blob/master/vendor_bundled/composer.json
 # Instead, tilde (~) should be used unless there's a documented exception.
 
+if ! command -v jq &> /dev/null; then
+  echo "Error: jq is not installed. Please install jq before running this script."
+  exit 1
+fi
+
 echo "Checking for ^ operators in composer.json require and require-dev..."
 
 MATCHES=$(jq '.require, .["require-dev"]' vendor_bundled/composer.json | grep -E '": "\^' || true)


=====================================
vendor_bundled/composer.json
=====================================
@@ -230,7 +230,7 @@
         "michelf/php-smartypants": "~1.8",
         "monolog/monolog": "~3.0",
         "montefuscolo/xmpp": "~0.8",
-        "nicolaskruchten/pivottable": "^2.20.0",
+        "nicolaskruchten/pivottable": "~2.20.0",
         "nlgen/nlgen": "~0.18",
         "onelogin/php-saml": "~4.2",
         "openannotation/annotator": ">=1.2.10",


=====================================
vendor_bundled/composer.lock
=====================================
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "dc8a591beb8661fee470fe5df7d64619",
+    "content-hash": "9d34ff86b2fe44fa5385d5df5e2690a0",
     "packages": [
         {
             "name": "amphp/amp",
@@ -6510,16 +6510,16 @@
         },
         {
             "name": "nicolaskruchten/pivottable",
-            "version": "v2.23.0",
+            "version": "v2.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nicolaskruchten/pivottable.git",
-                "reference": "a9cabee5382be0aaf0984ac906d9fa2e0376d2c1"
+                "reference": "4a9badf2eefd5afa5c8ade879c2c390bf8a21fff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nicolaskruchten/pivottable/zipball/a9cabee5382be0aaf0984ac906d9fa2e0376d2c1",
-                "reference": "a9cabee5382be0aaf0984ac906d9fa2e0376d2c1",
+                "url": "https://api.github.com/repos/nicolaskruchten/pivottable/zipball/4a9badf2eefd5afa5c8ade879c2c390bf8a21fff",
+                "reference": "4a9badf2eefd5afa5c8ade879c2c390bf8a21fff",
                 "shasum": ""
             },
             "require": {
@@ -6551,9 +6551,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nicolaskruchten/pivottable/issues",
-                "source": "https://github.com/nicolaskruchten/pivottable/tree/master"
+                "source": "https://github.com/nicolaskruchten/pivottable/tree/v2.20.0"
             },
-            "time": "2018-11-04T18:21:09+00:00"
+            "time": "2018-03-21T14:30:58+00:00"
         },
         {
             "name": "nlgen/nlgen",



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/d6e44d426eea0908a93bdb6fe94cd6325acec67a

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/d6e44d426eea0908a93bdb6fe94cd6325acec67a
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs