From 1e55a7283db1663d4427d60810378ea01a315790 Mon Sep 17 00:00:00 2001 From: tuutti Date: Thu, 4 Apr 2024 08:30:21 +0300 Subject: [PATCH 1/3] UHF-9564: Update to PHP 8.3 --- .env | 2 +- .github/workflows/artifact.yml | 2 +- .github/workflows/auto-release-pr.yml | 4 +--- .github/workflows/test.yml | 2 +- .github/workflows/update-config.yml | 2 +- compose.yaml | 2 -- 6 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.env b/.env index 69eed9fb..edf43114 100644 --- a/.env +++ b/.env @@ -19,7 +19,7 @@ COMPOSE_PROFILES=queue DRUPAL_HOSTNAME=helfi-kuva.docker.so # Docker image -DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.2 +DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.3 # Public webroot DRUPAL_WEBROOT=public diff --git a/.github/workflows/artifact.yml b/.github/workflows/artifact.yml index 995f988c..535dc82b 100644 --- a/.github/workflows/artifact.yml +++ b/.github/workflows/artifact.yml @@ -9,7 +9,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine + image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine services: db: diff --git a/.github/workflows/auto-release-pr.yml b/.github/workflows/auto-release-pr.yml index ace630fd..2877f7de 100644 --- a/.github/workflows/auto-release-pr.yml +++ b/.github/workflows/auto-release-pr.yml @@ -7,9 +7,7 @@ jobs: release-pr: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 1 + - uses: actions/checkout@v4 - name: Create pull request run: | gh pr create \ diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index def4fd37..2f3761fc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: tests: runs-on: ubuntu-latest container: - image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine + image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine options: --hostname app services: diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml index 7fbcbb7f..e16997ac 100644 --- a/.github/workflows/update-config.yml +++ b/.github/workflows/update-config.yml @@ -9,7 +9,7 @@ jobs: update-config: runs-on: ubuntu-latest container: - image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine + image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine services: db: diff --git a/compose.yaml b/compose.yaml index 344033c2..e2bc345c 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,5 +1,3 @@ -version: '3.7' - services: app: container_name: "${COMPOSE_PROJECT_NAME}-app" From 7c5fc0148e816b7b571f5fdafbbf24879fa56bd9 Mon Sep 17 00:00:00 2001 From: tuutti Date: Thu, 4 Apr 2024 09:27:37 +0300 Subject: [PATCH 2/3] UHF-9564: Updated Dockerfile --- docker/openshift/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/openshift/Dockerfile b/docker/openshift/Dockerfile index 6f82194d..3d009e9b 100644 --- a/docker/openshift/Dockerfile +++ b/docker/openshift/Dockerfile @@ -1,4 +1,4 @@ -ARG DRUPAL_DOCKER_TAG=8.2 +ARG DRUPAL_DOCKER_TAG=8.3 FROM ghcr.io/city-of-helsinki/drupal-docker-base:${DRUPAL_DOCKER_TAG} COPY / /var/www/html/ From 789c38c7eeb4da4be15a68009e30310fe6e4e505 Mon Sep 17 00:00:00 2001 From: tuutti Date: Thu, 4 Apr 2024 11:15:07 +0300 Subject: [PATCH 3/3] UHF-9564: Fixed translations folder issue --- .github/workflows/update-config.yml | 6 ++++++ tools/make/project/install.mk | 1 + 2 files changed, 7 insertions(+) diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml index e16997ac..347b9b96 100644 --- a/.github/workflows/update-config.yml +++ b/.github/workflows/update-config.yml @@ -31,6 +31,12 @@ jobs: run: | gh run download -n latest.sql + - name: Prepare setup + run: | + # We install Drupal from existing dump, so locale_install() hook + # is never fired. Make sure the translations folder exists. + mkdir -p public/sites/default/files/translations -p + - name: Build project run: | composer install --no-interaction diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk index 889b5c36..02cca319 100644 --- a/tools/make/project/install.mk +++ b/tools/make/project/install.mk @@ -35,6 +35,7 @@ drush-helfi-enable-modules: ## Enable modules and base configurations. PHONY += drush-locale-update drush-locale-update: ## Update translations. $(call step,Update translations...) + @mkdir -p public/sites/default/files/translations $(call drush,state:set locale.translation_last_checked 0) $(call drush,locale:check) $(call drush,locale:update)