Skip to content

Commit

Permalink
Merge branch 'master' into 4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
wodbot committed Sep 21, 2023
2 parents d67f740 + 2b9d203 commit b3e465c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ on:
pull_request:

env:
DRUPAL10: '10.1.3'
DRUPAL9: '9.5.10'
DRUPAL10: '10.1.4'
DRUPAL9: '9.5.11'
DRUPAL7: '7.98'
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion 10/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DRUPAL_VER ?= 10.1.3
DRUPAL_VER ?= 10.1.4
DRUPAL_VER_MAJOR ?= $(shell echo "${DRUPAL_VER}" | grep -oE '^[0-9]+')

PHP_VER ?= 8.2
Expand Down
2 changes: 1 addition & 1 deletion 9/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-include env_make

DRUPAL_VER ?= 9.5.10
DRUPAL_VER ?= 9.5.11
DRUPAL_VER_MAJOR ?= $(shell echo "${DRUPAL_VER}" | grep -oE '^[0-9]+')

PHP_VER ?= 8.1
Expand Down

0 comments on commit b3e465c

Please sign in to comment.