From 7d6ad2152edd7e223f79f2c45ea7ef52c7dd016f Mon Sep 17 00:00:00 2001
From: Kuzia <kuzia@kuzia.space>
Date: Thu, 28 Sep 2023 18:29:50 +0300
Subject: [PATCH 1/2] add php supported test matrix

---
 .github/workflows/main.yml    | 6 ++++++
 composer.json                 | 2 +-
 docker-compose.yml            | 5 ++++-
 docker/images/dplr/Dockerfile | 3 ++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5956150..8beabfb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,6 +4,11 @@ on: [push]
 
 jobs:
   build:
+    strategy:
+      matrix:
+        version: ['7.4', '8.0', '8.1', '8.2']
+    env:
+        PHP_VERSION: ${{ matrix.version }}
 
     runs-on: ubuntu-latest
 
@@ -33,6 +38,7 @@ jobs:
 
     - name: Check with php-cs-fixer
       run: docker-compose run --rm --no-deps dplr vendor/bin/php-cs-fixer fix --dry-run --using-cache=no --show-progress=none -v
+      if: ${{ matrix.version == '7.4' }}
 
     - name: Run tests
       run: docker-compose run --rm --no-deps dplr vendor/bin/phpunit
diff --git a/composer.json b/composer.json
index 5b34a92..4ff3318 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.4 || ^8",
         "ext-json": "*"
     },
     "autoload": {
diff --git a/docker-compose.yml b/docker-compose.yml
index ae1ffbe..e89361c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,10 @@
 version: "3.1"
 services:
     dplr:
-        build: docker/images/dplr
+        build:
+            context: ./docker/images/dplr
+            args:
+                PHP_VERSION: ${PHP_VERSION:-7.4}
         working_dir: /var/www/dplr
         volumes:
             - ./:/var/www/dplr
diff --git a/docker/images/dplr/Dockerfile b/docker/images/dplr/Dockerfile
index 6c2bf7b..0f3210f 100644
--- a/docker/images/dplr/Dockerfile
+++ b/docker/images/dplr/Dockerfile
@@ -1,3 +1,4 @@
+ARG PHP_VERSION=7.4
 FROM golang:alpine AS gossha
 
 RUN apk --update --no-cache add --virtual build-dependencies \
@@ -5,7 +6,7 @@ RUN apk --update --no-cache add --virtual build-dependencies \
     && go install github.com/YuriyNasretdinov/GoSSHa@latest \
     && apk update && apk del build-dependencies
 
-FROM php:7.3-alpine
+FROM php:${PHP_VERSION}-alpine
 
 COPY --from=gossha /go/bin/GoSSHa /usr/local/bin/GoSSHa
 

From 47779819e3e72241a36192822f5669fdf93f29e2 Mon Sep 17 00:00:00 2001
From: Kuzia <kuzia@kuzia.space>
Date: Thu, 28 Sep 2023 19:19:10 +0300
Subject: [PATCH 2/2] increase swap?

---
 .github/workflows/main.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8beabfb..2fca57d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,6 +13,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    - name: Set Swap Space
+      uses: pierotofy/set-swap-space@master
+      with:
+        swap-size-gb: 10
+
     - uses: actions/checkout@v2
 
     - name: Generate ssh keygen for the containers interaction