From 30684f603bcce7a30849a4340e07e37fedaf98de Mon Sep 17 00:00:00 2001
From: mfilip <marcin.filip@gmail.com>
Date: Tue, 31 Oct 2023 11:23:54 +0100
Subject: [PATCH] update

---
 .github/workflows/ci-73-m24.yml            | 23 ----------------------
 .github/workflows/ci-73.yml                | 23 ----------------------
 .github/workflows/{ci-74.yml => ci-81.yml} |  4 ++--
 Makefile                                   |  9 +--------
 docker/install-magento                     |  7 ++++++-
 test/e2e/tsconfig.json                     |  4 +---
 test/snapshot/tsconfig.json                |  4 +---
 7 files changed, 11 insertions(+), 63 deletions(-)
 delete mode 100644 .github/workflows/ci-73-m24.yml
 delete mode 100644 .github/workflows/ci-73.yml
 rename .github/workflows/{ci-74.yml => ci-81.yml} (89%)

diff --git a/.github/workflows/ci-73-m24.yml b/.github/workflows/ci-73-m24.yml
deleted file mode 100644
index 091d1dfe..00000000
--- a/.github/workflows/ci-73-m24.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Magento 2.4 CI
-
-on:
-  - push
-
-jobs:
-  ci:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-
-      - name: Launch Magento test environment
-        env:
-          PHP: "73-m24"
-          COMPOSE_INTERACTIVE_NO_CLI: "1"
-        run: make up
-
-      - uses: cypress-io/github-action@v2
-        with:
-          project: ./test/e2e
-        env:
-          CYPRESS_API_KEY: ${{ secrets.API_KEY }}
-          CYPRESS_MAGENTO_VERSION: "2.4"
diff --git a/.github/workflows/ci-73.yml b/.github/workflows/ci-73.yml
deleted file mode 100644
index c3a9ebc4..00000000
--- a/.github/workflows/ci-73.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Magento 2.3 CI
-
-on:
-  - push
-
-jobs:
-  ci:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-
-      - name: Launch Magento test environment
-        env:
-          PHP: "73"
-          COMPOSE_INTERACTIVE_NO_CLI: "1"
-        run: make up
-
-      - uses: cypress-io/github-action@v2
-        with:
-          project: ./test/e2e
-        env:
-          CYPRESS_API_KEY: ${{ secrets.API_KEY }}
-          CYPRESS_MAGENTO_VERSION: "2.3"
diff --git a/.github/workflows/ci-74.yml b/.github/workflows/ci-81.yml
similarity index 89%
rename from .github/workflows/ci-74.yml
rename to .github/workflows/ci-81.yml
index 108c60d9..32c2b378 100644
--- a/.github/workflows/ci-74.yml
+++ b/.github/workflows/ci-81.yml
@@ -1,4 +1,4 @@
-name: Magento 2.4 CI with PHP 7.4
+name: Magento 2.4 CI with PHP 8.1
 
 on:
   - push
@@ -11,7 +11,7 @@ jobs:
 
       - name: Launch Magento test environment
         env:
-          PHP: "74"
+          PHP: "81"
           COMPOSE_INTERACTIVE_NO_CLI: "1"
         run: make up
 
diff --git a/Makefile b/Makefile
index a656b32c..44402982 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,12 @@
 PHP ?= 81
 .DEFAULT_GOAL := help
 TAG=${git describe --tags}
-VERSIONS := 81 74
-
-
 
 ## -- Container Launch --
 
 ## Launch docker-compose as background daemon
 .PHONY: up
-up: build init fix-session-expire
+up: build init
 
 
 .PHONY: build
@@ -24,11 +21,7 @@ down:
 ## Initialise repository - run install-magento
 .PHONY: init
 init:
-ifeq ($(filter $(PHP),$(VERSIONS)),)
-	docker-compose exec -T web dockerize -wait tcp://db:3306 -timeout 60m /usr/local/bin/install-magento
-else
 	docker-compose exec -T web dockerize -wait tcp://db:3306 -wait tcp://elasticsearch:9200 -timeout 60m /usr/local/bin/install-magento
-endif
 
 ## -- Development Methods --
 
diff --git a/docker/install-magento b/docker/install-magento
index b0668a3a..f3eb8185 100644
--- a/docker/install-magento
+++ b/docker/install-magento
@@ -42,7 +42,12 @@ echo 'Running magento setup:install'
   --admin-lastname=$MAGENTO_ADMIN_LASTNAME \
   --admin-email=$MAGENTO_ADMIN_EMAIL \
   --admin-user=$MAGENTO_ADMIN_USERNAME \
-  --admin-password=$MAGENTO_ADMIN_PASSWORD
+  --admin-password=$MAGENTO_ADMIN_PASSWORD \
+  --search-engine='elasticsearch7' \
+  --elasticsearch-host='elasticsearch' \
+  --elasticsearch-port='9200' \
+  --elasticsearch-enable-auth='0' \
+  --elasticsearch-timeout='60'
 
 echo 'Enabled Ideal Postcodes extension'
 /var/www/html/bin/magento module:enable Idealpostcodes_Ukaddresssearch
diff --git a/test/e2e/tsconfig.json b/test/e2e/tsconfig.json
index 6b2e65b6..f87a578b 100644
--- a/test/e2e/tsconfig.json
+++ b/test/e2e/tsconfig.json
@@ -1,9 +1,7 @@
 {
   "compilerOptions": {
-    "strict": true,
-    "baseUrl": "../../node_modules",
     "target": "es5",
-    "lib": ["ES2015", "es5", "dom"],
+    "lib": ["es5", "dom"],
     "types": ["cypress"]
   },
   "include": ["**/*.ts"]
diff --git a/test/snapshot/tsconfig.json b/test/snapshot/tsconfig.json
index 6b2e65b6..f87a578b 100644
--- a/test/snapshot/tsconfig.json
+++ b/test/snapshot/tsconfig.json
@@ -1,9 +1,7 @@
 {
   "compilerOptions": {
-    "strict": true,
-    "baseUrl": "../../node_modules",
     "target": "es5",
-    "lib": ["ES2015", "es5", "dom"],
+    "lib": ["es5", "dom"],
     "types": ["cypress"]
   },
   "include": ["**/*.ts"]