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 8, 2024
2 parents 06ec1a1 + f41a7cc commit 5f69a0f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .drupal-php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
8.3#2024-10-14T10:24:56.046572Z
8.2#2024-10-14T10:24:56.046572Z
8.1#2024-10-14T10:24:56.046572Z
8.3#2024-10-31T02:30:54.437071Z
8.2#2024-10-31T02:30:54.437071Z
8.1#2024-10-31T02:30:54.437071Z
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.5'
DRUPAL10: '10.3.6'
DRUPAL11: '11.0.6'
DRUPAL10: '10.3.7'
DRUPAL7: '7.101'
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.6
DRUPAL_VER ?= 10.3.7
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.5
DRUPAL_VER ?= 11.0.6
DRUPAL_VER_MAJOR ?= $(shell echo "${DRUPAL_VER}" | grep -oE '^[0-9]+')

PHP_VER ?= 8.3
Expand Down

0 comments on commit 5f69a0f

Please sign in to comment.