Skip to content

Commit

Permalink
Merge pull request #605 from City-of-Helsinki/UHF-X-scan-langcode
Browse files Browse the repository at this point in the history
Updated actions to v4, scan langcode of exported configuration
  • Loading branch information
tuutti authored Mar 20, 2024
2 parents 1bb67dc + 79ff155 commit a97233c
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/artifact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,17 @@ jobs:
- 3306:3306

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 1
- uses: actions/checkout@v4

- 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 that does not match the pattern 'langcode: (en|und)':" >> $GITHUB_STEP_SUMMARY
echo "$OUTPUT" >> $GITHUB_STEP_SUMMARY
exit 1
fi
- name: Build project
run: composer install --no-interaction
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/update-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:

steps:
- uses: actions/checkout@v4

- name: Download latest dump
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 3 additions & 1 deletion docker/openshift/entrypoints/10-preflight.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit a97233c

Please sign in to comment.