Merge pull request #362 from City-of-Helsinki/dev

Release 25.10.2022
City-of-Helsinki · Oct 25, 2022 · accda69 · accda69
2 parents 26f234f + 99f5010
commit accda69
Show file tree

Hide file tree

Showing 8 changed files with 115 additions and 89 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,19 +30,23 @@ jobs:
       - name: Build project
         run: composer install
 
+      - name: Check that subtheme is not built with dev mode
+        run: if grep -q 'sourceMappingURL=' -R public/themes/custom/hdbt_subtheme/dist/css; then exit 1; fi
+
       - name: Run PHPCS
         run: |
           vendor/bin/phpcs public/modules/custom/ --ignore="*.js,*.css" --extensions=php,module,install --standard=Drupal
           vendor/bin/phpcs public/themes/custom/ --ignore="*.js,*.css" --extensions=php,theme --standard=Drupal
-          
+
       - name: Download latest dump
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh run download -n latest.sql
+        run: gh run download -n latest.sql
 
       - name: Install Drupal
-        run: mysql --user=drupal --password=drupal --database=drupal --host=db --port=3306 -A < latest.sql
+        run: |
+          mysql --user=drupal --password=drupal --database=drupal --host=db --port=3306 -A < latest.sql
+          drush cr && drush cim -y
 
       - name: Start services
         run: |

diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml
@@ -41,8 +41,7 @@ jobs:
           $(drush sql:connect) < latest.sql
           drush cr && drush cim -y
           composer update drupal/helfi_* drupal/hdbt* -W
-          drush updb -y
-          drush cex -y
+          drush cr && drush updb -y && drush cex -y
           # Update platform
           drush helfi:tools:update-platform