From a1512f4f93a2e67a06c7df68613ce34900d5d66f Mon Sep 17 00:00:00 2001
From: Martin Gruner <mg@zammad.com>
Date: Fri, 21 Jan 2022 09:44:00 +0100
Subject: [PATCH] Maintenance: Improve CI config to use any NodeJS available on
 the CentOS CI image.

---
 .gitlab-ci.yml     | 2 +-
 .gitlab/ci/pre.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d6a00604e..3a4db5d1a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,7 +55,7 @@ cache:
 # Initialize application env
 before_script:
   - source /etc/profile.d/rvm.sh
-  - source /opt/rh/rh-nodejs12/enable
+  - source /opt/rh/rh-nodejs*/enable
   - bundle install -j $(nproc) --path vendor
   - bundle exec ruby .gitlab/configure_environment.rb
   - source .gitlab/environment.env
diff --git a/.gitlab/ci/pre.yml b/.gitlab/ci/pre.yml
index 137594f72..df70c40d3 100644
--- a/.gitlab/ci/pre.yml
+++ b/.gitlab/ci/pre.yml
@@ -6,7 +6,7 @@
     - .rules_singletest
   before_script:
     - source /etc/profile.d/rvm.sh # ensure RVM is loaded
-    - source /opt/rh/rh-nodejs12/enable # ensure Node.js is available
+    - source /opt/rh/rh-nodejs*/enable # ensure Node.js is available
 
 rubocop:
   <<: *template_pre
@@ -72,7 +72,7 @@ coffeelint:
 stylelint:
   <<: *template_pre
   before_script:
-    - source /opt/rh/rh-nodejs12/enable
+    - source /opt/rh/rh-nodejs*/enable
     - yarn install
   script:
     - yarn lint:css