update

.github/workflows/ci-74.yml → .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
 

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 --
 

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

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"]

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"]