From 8f189978a615cff8765ae91bb7208b22b0d753e6 Mon Sep 17 00:00:00 2001
From: Chingis Sandanov <chingis@chingis.io>
Date: Sat, 23 Nov 2024 14:55:57 +0300
Subject: [PATCH] Add php 8.4

---
 .github/workflows/workflow.yml | 47 +++++++++++++++++++++++++++++++---
 .php                           |  1 +
 Makefile                       |  6 ++++-
 README.md                      |  9 ++++---
 4 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 8bd4a77..d41b9c4 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -16,6 +16,19 @@ env:
   DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
 jobs:
+  php84:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
+      - uses: docker/setup-buildx-action@v3
+      - uses: ./.github/actions
+        with:
+          version: '8.4'
+          tags: 8.4,8,latest
+          platform: linux/amd64,linux/arm64  
   php83:
     runs-on: ubuntu-latest
     steps:
@@ -27,7 +40,7 @@ jobs:
     - uses: ./.github/actions
       with:
         version: '8.3'
-        tags: 8.3,8,latest
+        tags: 8.3
         platform: linux/amd64,linux/arm64
   php82:
     runs-on: ubuntu-latest
@@ -56,6 +69,20 @@ jobs:
         tags: 8.1
         platform: linux/amd64,linux/arm64
   ### dev
+  php84-dev:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
+      - uses: docker/setup-buildx-action@v3
+      - uses: ./.github/actions
+        with:
+          version: '8.4'
+          dev: 1
+          tags: 8.4-dev,8-dev,dev
+          platform: linux/amd64,linux/arm64
   php83-dev:
     runs-on: ubuntu-latest
     steps:
@@ -68,7 +95,7 @@ jobs:
       with:
         version: '8.3'
         dev: 1
-        tags: 8.3-dev,8-dev,dev
+        tags: 8.3-dev
         platform: linux/amd64,linux/arm64
   php82-dev:
     runs-on: ubuntu-latest
@@ -99,6 +126,20 @@ jobs:
         tags: 8.1-dev
         platform: linux/amd64,linux/arm64
   ### dev-macos
+  php84-dev-macos:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
+      - uses: docker/setup-buildx-action@v3
+      - uses: ./.github/actions
+        with:
+          version: '8.4'
+          dev_macos: 1
+          tags: 8.4-dev-macos,8-dev-macos,dev-macos
+          platform: linux/amd64,linux/arm64  
   php83-dev-macos:
     runs-on: ubuntu-latest
     steps:
@@ -111,7 +152,7 @@ jobs:
       with:
         version: '8.3'
         dev_macos: 1
-        tags: 8.3-dev-macos,8-dev-macos,dev-macos
+        tags: 8.3-dev-macos
         platform: linux/amd64,linux/arm64
   php82-dev-macos:
     runs-on: ubuntu-latest
diff --git a/.php b/.php
index 804b09d..bdc56b0 100644
--- a/.php
+++ b/.php
@@ -1,3 +1,4 @@
+8.4#2024-11-23T06:25:18.100787Z
 8.3#2024-11-23T06:25:18.100787Z
 8.2#2024-11-23T06:25:18.100787Z
 8.1#2024-11-23T06:25:18.100787Z
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 60388e9..23c6fe4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 -include env_make
 
-PHP_VER ?= 8.3
+PHP_VER ?= 8.4
 
 BASE_IMAGE_TAG = $(PHP_VER)
 REGISTRY ?= docker.io
@@ -70,6 +70,10 @@ ifeq ($(PHP_VER),8.3)
 	@echo "Drupal 7 doesn't support PHP 8.3"
 	cd ./tests/11 && IMAGE=$(REPO):$(TAG) ./run.sh
 #	cd ./tests/10 && IMAGE=$(REPO):$(TAG) ./run.sh
+else ifeq ($(PHP_VER),8.4)
+	@echo "Drupal 7 doesn't support PHP 8.4"
+	cd ./tests/11 && IMAGE=$(REPO):$(TAG) ./run.sh
+#	cd ./tests/10 && IMAGE=$(REPO):$(TAG) ./run.sh
 else
 	cd ./tests/10 && IMAGE=$(REPO):$(TAG) ./run.sh
 	cd ./tests/7 && IMAGE=$(REPO):$(TAG) ./run.sh
diff --git a/README.md b/README.md
index 0bec350..88cde34 100644
--- a/README.md
+++ b/README.md
@@ -17,13 +17,16 @@ Overview:
 
 Supported tags and respective `Dockerxfile` links:
 
-- `8.3`, `8`, `latest`  [_(Dockerfile)_]
+- `8.4`, `8`, `latest`  [_(Dockerfile)_]
+- `8.3` [_(Dockerfile)_]
 - `8.2` [_(Dockerfile)_]
 - `8.1` [_(Dockerfile)_]
-- `8.3-dev`, `8-dev`, `dev` [_(Dockerfile)_]
+- `8.4-dev`, `8-dev`, `dev` [_(Dockerfile)_]
+- `8.3-dev` [_(Dockerfile)_]
 - `8.2-dev` [_(Dockerfile)_]
 - `8.1-dev` [_(Dockerfile)_]
-- `8.3-dev-macos`, `8-dev-macos`, `dev-macos` [_(Dockerfile)_]
+- `8.4-dev-macos`, `8-dev-macos`, `dev-macos` [_(Dockerfile)_]
+- `8.3-dev-macos` [_(Dockerfile)_]
 - `8.2-dev-macos` [_(Dockerfile)_]
 - `8.1-dev-macos` [_(Dockerfile)_]