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 Nov 23, 2024
2 parents 2841003 + 3b7135b commit a02ffc2
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:
DRUPAL11: '11.0.8'
DRUPAL10: '10.3.9'
DRUPAL11: '11.0.9'
DRUPAL10: '10.3.10'
DRUPAL7: '7.102'
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.3.9
DRUPAL_VER ?= 10.3.10
DRUPAL_VER_MAJOR ?= $(shell echo "${DRUPAL_VER}" | grep -oE '^[0-9]+')

PHP_VER ?= 8.3
Expand Down
2 changes: 1 addition & 1 deletion 11/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DRUPAL_VER ?= 11.0.8
DRUPAL_VER ?= 11.0.9
DRUPAL_VER_MAJOR ?= $(shell echo "${DRUPAL_VER}" | grep -oE '^[0-9]+')

PHP_VER ?= 8.3
Expand Down

0 comments on commit a02ffc2

Please sign in to comment.