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

Dev to main
City-of-Helsinki · Aug 30, 2023 · c2dacd5 · c2dacd5
2 parents 9241eef + 8802316
commit c2dacd5
Show file tree

Hide file tree

Showing 20 changed files with 197 additions and 271 deletions.
diff --git a/.github/workflows/artifact.yml b/.github/workflows/artifact.yml
@@ -5,16 +5,11 @@ on:
  schedule:
  - cron: '0 0 * * 0'
 name: Build artifacts
-env:
- DRUPAL_BUILD_FROM_SCRATCH: true
- SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal"
- SIMPLETEST_BASE_URL: "http://127.0.0.1:8080"
- XDEBUG_MODE: off
 jobs:
  build:
  runs-on: ubuntu-latest
  container:
- image: ghcr.io/city-of-helsinki/drupal-php-docker:8.1-alpine
+ image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine
 
  services:
  db:
@@ -33,7 +28,7 @@ jobs:
  fetch-depth: 1
 
  - name: Build project
- run: composer install
+ run: composer install --no-interaction
 
  - name: Setup drupal and save database dump
  run: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,15 +4,12 @@ on:
  branches: ['main', 'dev']
 name: CI
 env:
- SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal"
- SIMPLETEST_BASE_URL: "http://127.0.0.1:8080"
  SYMFONY_DEPRECATIONS_HELPER: disabled
- XDEBUG_MODE: off
 jobs:
  tests:
  runs-on: ubuntu-latest
  container:
- image: ghcr.io/city-of-helsinki/drupal-php-docker:8.1-alpine
+ image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine
 
  services:
  db:
@@ -31,7 +28,7 @@ jobs:
  fetch-depth: 1
 
  - name: Build project
- run: composer install
+ run: composer install --no-interaction
 
  - name: Scan security updates
  run: drush pm:security

diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml
@@ -3,15 +3,11 @@ on:
  repository_dispatch:
  types: [config_change]
 name: Update config
-env:
- SIMPLETEST_BASE_URL: "http://127.0.0.1:8080"
- SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal"
- XDEBUG_MODE: off
 jobs:
  update-config:
  runs-on: ubuntu-latest
  container:
- image: ghcr.io/city-of-helsinki/drupal-php-docker:8.1-alpine
+ image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine
 
  services:
  db:
@@ -37,10 +33,10 @@ jobs:
 
  - name: Build project
  run: |
- composer install
+ composer install --no-interaction
  $(drush sql:connect) < latest.sql
  drush cim -y && drush updb -y && drush cr
- composer update drupal/helfi_* drupal/hdbt* -W
+ composer update drupal/helfi_* drupal/hdbt* -W --no-interaction
  drush cr && drush updb -y && drush cex -y
  # Update platform
  drush helfi:tools:update-platform