[TikiWiki-commits] [Git][tikiwiki/tiki][master] 4 commits: [UPD] Regenerate package-lock.json to remove node_modules in src/js

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


Commits:
b2592844 by Benoit Grégoire at 2026-02-10T06:40:51+00:00
[UPD] Regenerate package-lock.json to remove node_modules in src/js

- - - - -
a3836e15 by Benoit Grégoire at 2026-02-10T06:40:51+00:00
[ENH] CI: Re-order PHP versions to see unit tests with most recent version first in results lists.  Remove redundant test combination

- - - - -
2e5194f4 by Benoit Grégoire at 2026-02-10T06:40:51+00:00
[UPD] CI:  Move to node 24 (current active lts), mostly for the reduced memory usage.

- - - - -
c7616174 by Benoit Grégoire at 2026-02-10T06:40:51+00:00
[ENH] CI:  Drop --max-processes to 1 in build target, as ci runners are starting to hit memory limits.  This isn't a proper fix, but it may help.  Positive side effect:  slightly easier to read CI logs.

- - - - -


3 changed files:

- .gitlab-ci.yml
- package-lock.json
- package.json


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -33,7 +33,7 @@ variables:
   MANTICORE_NEWEST_SUPPORTED: 15.1.0
   #Only for older version upgrade tests these days
   MYSQL_5_IMAGE: mysql:5.7.44
-  NODE_IMAGE: node:20
+  NODE_IMAGE: node:24
   MANTICORE_DSN: http://manticore
   # You can set USE_GITLAB_PROXY to "true" in your project configuration to use the gitlab dependency proxy. (default not using as it may cause issues for some accounts)
   USE_GITLAB_PROXY: ''
@@ -101,12 +101,15 @@ node_modules:
 node_build:
   stage: build
   needs:
-    - node_modules  #This is only because we still have some scss files installed from composer - 2023-11-17
+    - node_modules  
+    #This is only because we still have some scss files installed from composer - 2023-11-17
     - composer
   image:
     name: ${DEPENDENCY_PROXY_PREFIX}${NODE_IMAGE}
   script:
-    - npm run build
+    - free -h
+    - NODE_OPTIONS="--max-old-space-size=4096" npm run build
+    - free -h
   artifacts:
     expire_in: 2 days
     paths:
@@ -218,7 +221,7 @@ phplint:
   # No point in using cache, on fast hardware it's almost as fast to compute as it is to verify the cache - benoitg - 2026-01-26
   parallel:
     matrix:
-      - PHP_VERSION: ['8.1', '8.5'] #Checking more than max and min PHP versions just wastes CI minutes
+      - PHP_VERSION: ['8.5', '8.1'] #Checking more than max and min PHP versions just wastes CI minutes
 
 smarty-lint:
   stage: code-quality
@@ -571,18 +574,16 @@ unit-tests:
   allow_failure: false
   parallel:
     matrix:
-      - PHP_VERSION: "8.1"
-        DB_IMAGE: ${MYSQL_IMAGE_OLDEST_SUPPORTED}
-      - PHP_VERSION: "8.2"
+      - PHP_VERSION: "8.5"
+        DB_IMAGE: ${MARIADB_IMAGE_NEWEST_SUPPORTED}
+      - PHP_VERSION: "8.4"
         DB_IMAGE: ${MYSQL_IMAGE_NEWEST_SUPPORTED}
-      - PHP_VERSION: "8.1"
-        DB_IMAGE: ${MARIADB_IMAGE_OLDEST_SUPPORTED}
       - PHP_VERSION: "8.3"
         DB_IMAGE: ${MARIADB_IMAGE_COMMON_LTS}
-      - PHP_VERSION: "8.4"
-        DB_IMAGE: ${MARIADB_IMAGE_NEWEST_SUPPORTED}
-      - PHP_VERSION: "8.5"
-        DB_IMAGE: ${MYSQL_IMAGE_NEWEST_SUPPORTED}
+      - PHP_VERSION: "8.2"
+        DB_IMAGE: ${MYSQL_IMAGE_OLDEST_SUPPORTED}
+      - PHP_VERSION: "8.1"
+        DB_IMAGE: ${MARIADB_IMAGE_OLDEST_SUPPORTED}
 
 unit-tests-node:
   stage: unit-tests


=====================================
package-lock.json
=====================================
The diff for this file was not included because it is too large.

=====================================
package.json
=====================================
@@ -29,7 +29,7 @@
         "build:js" : "vite --config=src/js/vite.config.mjs build --mode=production",
         "build:scss" : "npm run build -w src/scss",
         "build:_custom" : "copy-and-watch '_custom/**/themes/**/*.{woff,woff2,ttf,otf,svg,png,gif,jpg}' '_custom/**/{lang,js}/**/*.{js,mjs}' public/generated/_custom",
-        "build" : "concurrently  --kill-others-on-fail \"npm:build:*\"",
+        "build" : "concurrently --max-processes=1 --kill-others-on-fail \"npm:build:*\"",
         "prewatch" : "npm run checkEnvironment",
         "watch:generateIconList" : "npm run build:generateIconList",
         "watch:js" : "vite --config=src/js/vite.config.mjs build --watch --mode=development",



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/compare/3b6eb76325b35113073bdef784f5159cb502942c...c7616174824ee34cff8332f837e2f1bb6ff06813

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/compare/3b6eb76325b35113073bdef784f5159cb502942c...c7616174824ee34cff8332f837e2f1bb6ff06813
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