Merge remote-tracking branch 'origin/master'

wodby · Nov 4, 2024 · 363cb65 · 363cb65
2 parents 5d4fdd8 + d6211b5
commit 363cb65
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -24,7 +24,7 @@ jobs:
     - uses: docker/setup-buildx-action@v3
     - uses: ./.github/actions
       with:
-        version: '11.4.3'
+        version: '11.4.4'
         tags: '11.4,11,latest'
         workdir: 11
         platform: linux/amd64,linux/arm64
@@ -38,7 +38,7 @@ jobs:
     - uses: docker/setup-buildx-action@v3
     - uses: ./.github/actions
       with:
-        version: '10.11.9'
+        version: '10.11.10'
         tags: '10.11,10'
         workdir: 10
         platform: linux/amd64,linux/arm64
@@ -52,7 +52,7 @@ jobs:
     - uses: docker/setup-buildx-action@v3
     - uses: ./.github/actions
       with:
-        version: '10.6.19'
+        version: '10.6.20'
         tags: '10.6'
         workdir: 10
         platform: linux/amd64,linux/arm64
@@ -66,7 +66,7 @@ jobs:
     - uses: docker/setup-buildx-action@v3
     - uses: ./.github/actions
       with:
-        version: '10.5.26'
+        version: '10.5.27'
         tags: '10.5'
         workdir: 10
         platform: linux/amd64,linux/arm64
diff --git a/10/Makefile b/10/Makefile
@@ -1,6 +1,6 @@
 -include env_make
 
-MARIADB_VER ?= 10.11.9
+MARIADB_VER ?= 10.11.10
 MARIADB_VER_MINOR = $(shell echo "${MARIADB_VER}" | grep -oE '^[0-9]+\.[0-9]+')
 
 GALERA_VER ?=

diff --git a/11/Makefile b/11/Makefile
@@ -1,6 +1,6 @@
 -include env_make
 
-MARIADB_VER ?= 11.4.3
+MARIADB_VER ?= 11.4.4
 MARIADB_VER_MINOR = $(shell echo "${MARIADB_VER}" | grep -oE '^[0-9]+\.[0-9]+')
 
 GALERA_VER ?=