From 54544880a61dd7e2cabef7d61acea3b0cfd811aa Mon Sep 17 00:00:00 2001
From: tuutti <tuutti@iki.fi>
Date: Wed, 20 Mar 2024 15:33:28 +0200
Subject: [PATCH] Updated actions to v4, scan langcode of exported
 configuration

---
 .github/workflows/artifact.yml               | 4 +---
 .github/workflows/test.yml                   | 4 ++--
 .github/workflows/update-config.yml          | 1 +
 docker/openshift/entrypoints/10-preflight.sh | 4 +++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/artifact.yml b/.github/workflows/artifact.yml
index 8e857716b..76519e893 100644
--- a/.github/workflows/artifact.yml
+++ b/.github/workflows/artifact.yml
@@ -23,9 +23,7 @@ jobs:
           - 3306:3306
 
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 1
+      - uses: actions/checkout@v4
 
       - name: Build project
         run: composer install --no-interaction
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c8a01e3e9..def4fd378 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,12 +27,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Make sure configuration was exported in correct language
+      - name: Make sure configuration was exported in correct language (en or und)
         run: |
           OUTPUT=$(grep -oP '^langcode: \b(?!(?:en|und)\b)\w+' conf -R || true)
 
           if [ ! -z "$OUTPUT" ]; then
-            echo "Found configuration exported in wrong language:" >> $GITHUB_STEP_SUMMARY
+            echo "Found configuration that does not match the pattern 'langcode: (en|und)':" >> $GITHUB_STEP_SUMMARY
             echo "$OUTPUT" >> $GITHUB_STEP_SUMMARY
             exit 1
           fi
diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml
index b76aa2619..efa3a9200 100644
--- a/.github/workflows/update-config.yml
+++ b/.github/workflows/update-config.yml
@@ -24,6 +24,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+
       - name: Download latest dump
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/docker/openshift/entrypoints/10-preflight.sh b/docker/openshift/entrypoints/10-preflight.sh
index 5cd45c010..b58e62131 100644
--- a/docker/openshift/entrypoints/10-preflight.sh
+++ b/docker/openshift/entrypoints/10-preflight.sh
@@ -4,6 +4,8 @@ source /init.sh
 
 if [ -f "../docker/openshift/preflight/preflight.php" ]; then
   echo "Running preflight checks ..."
-  php ../docker/openshift/preflight/preflight.php
+  if ! php ../docker/openshift/preflight/preflight.php; then
+    exit 1
+  fi
 fi