Merge branch 'release/3.26.0'

govCMS · Feb 17, 2022 · 6fac787 · 6fac787
2 parents b6255d6 + 329d9a5
commit 6fac787
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.env.default b/.env.default
@@ -35,15 +35,15 @@ PHP_IMAGE_VERSION=7.4
 
 # Set the GovCMS version to use - you can use a tag or branch reference here
 # See https://github.com/govCMS/govcms/releases
-GOVCMS_PROJECT_VERSION=7.x-3.25
+GOVCMS_PROJECT_VERSION=7.x-3.26
 
 # Set the version of the site audit script to use - you can use a tag or branch reference here
 # See https://github.com/govCMS/audit-site/releases
 SITE_AUDIT_VERSION=7.x-3.x
 
 # Set the Lagoon tag to use for the upstream dockerfiles (e.g. 20.12.0)
 # See https://hub.docker.com/r/uselagoon/php/tags
-LAGOON_IMAGE_VERSION=21.12.2
+LAGOON_IMAGE_VERSION=22.1.0
 
 # Set the release tag
 GOVCMS_RELEASE_TAG=edge
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -118,9 +118,9 @@ deploy:multiarch:
     - docker login -u $DOCKER_USER -p $DOCKER_PASS
     - ahoy publish y
   only:
-    - feature/multiarch-apple-silicon
     - develop
     - master
+    - /^release\//
     - tags
   needs:
   - test:ahoy