Merge pull request #18 from AmpersandHQ/2-4-6-p2-new-version

Add `2-4-4-p5`, `2-4-5-p4`, `2-4-6-p2`
AmpersandHQ · Sep 1, 2023 · 3ac12af · 3ac12af
2 parents 8e7d51f + ba22f5f
commit 3ac12af
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -16,12 +16,15 @@ env:
   - TEST_GROUP=2-4-4-p2   INTEGRATION=false
   - TEST_GROUP=2-4-4-p3   INTEGRATION=false
   - TEST_GROUP=2-4-4-p4   INTEGRATION=false
+  - TEST_GROUP=2-4-4-p5   INTEGRATION=false
   - TEST_GROUP=2-4-5      INTEGRATION=false
   - TEST_GROUP=2-4-5-p1   INTEGRATION=false
   - TEST_GROUP=2-4-5-p2   INTEGRATION=false
   - TEST_GROUP=2-4-5-p3   INTEGRATION=false
+  - TEST_GROUP=2-4-5-p4   INTEGRATION=false
   - TEST_GROUP=2-4-6      INTEGRATION=false
   - TEST_GROUP=2-4-6-p1   INTEGRATION=false
+  - TEST_GROUP=2-4-6-p2   INTEGRATION=false
   - TEST_GROUP=2-4-7-beta1   INTEGRATION=false
   - TEST_GROUP=2-latest   INTEGRATION=false
   - TEST_GROUP=2-3-7      INTEGRATION=true
@@ -38,12 +41,15 @@ env:
   - TEST_GROUP=2-4-4-p2   INTEGRATION=true
   - TEST_GROUP=2-4-4-p3   INTEGRATION=true
   - TEST_GROUP=2-4-4-p4   INTEGRATION=true
+  - TEST_GROUP=2-4-4-p5   INTEGRATION=true
   - TEST_GROUP=2-4-5      INTEGRATION=true
   - TEST_GROUP=2-4-5-p1   INTEGRATION=true
   - TEST_GROUP=2-4-5-p2   INTEGRATION=true
   - TEST_GROUP=2-4-5-p3   INTEGRATION=true
+  - TEST_GROUP=2-4-5-p4   INTEGRATION=true
   - TEST_GROUP=2-4-6      INTEGRATION=true
   - TEST_GROUP=2-4-6-p1   INTEGRATION=true
+  - TEST_GROUP=2-4-6-p2   INTEGRATION=true
   - TEST_GROUP=2-4-7-beta1   INTEGRATION=true
   - TEST_GROUP=2-latest   INTEGRATION=true
   - TEST_GROUP=2-latest   INTEGRATION=both

diff --git a/Makefile b/Makefile
@@ -46,6 +46,9 @@ COMPOSER_AUTH_JSON_LOCATION ?= './Dockerfile-assets/auth.json'
 2-4-4-p4:		 # Launch 2.4.4-p4
 	MAGE_VERSION="2.4.4-p4" PHP_VERSION='8.1.6' COMPOSER_VERSION='composer22' MYSQL_VERSION="mysql:8.0.32-debian" ELASTICSEARCH_VERSION='docker.elastic.co/elasticsearch/elasticsearch:7.17.0' ELASTICSEARCH_OPTIONS='--elasticsearch-host elasticsearch --elasticsearch-port 9200' MAGENTO_PORT=1234 CURRENT_EXTENSION=$(CURRENT_EXTENSION)  CURRENT_EXTENSION_VENDOR=$(CURRENT_EXTENSION_VENDOR) COMPOSER_AUTH_JSON_LOCATION=$(COMPOSER_AUTH_JSON_LOCATION) make docker-start
 
+2-4-4-p5:		 # Launch 2.4.4-p5
+	MAGE_VERSION="2.4.4-p5" PHP_VERSION='8.1.6' COMPOSER_VERSION='composer22' MYSQL_VERSION="mysql:8.0.32-debian" ELASTICSEARCH_VERSION='docker.elastic.co/elasticsearch/elasticsearch:7.17.0' ELASTICSEARCH_OPTIONS='--elasticsearch-host elasticsearch --elasticsearch-port 9200' MAGENTO_PORT=1234 CURRENT_EXTENSION=$(CURRENT_EXTENSION)  CURRENT_EXTENSION_VENDOR=$(CURRENT_EXTENSION_VENDOR) COMPOSER_AUTH_JSON_LOCATION=$(COMPOSER_AUTH_JSON_LOCATION) make docker-start
+
 2-4-5:			 # Launch 2.4.5
 	MAGE_VERSION="2.4.5" PHP_VERSION='8.1.6' COMPOSER_VERSION='composer22' MYSQL_VERSION="mysql:8.0.32-debian" ELASTICSEARCH_VERSION='docker.elastic.co/elasticsearch/elasticsearch:7.17.0' ELASTICSEARCH_OPTIONS='--elasticsearch-host elasticsearch --elasticsearch-port 9200' MAGENTO_PORT=1234 CURRENT_EXTENSION=$(CURRENT_EXTENSION)  CURRENT_EXTENSION_VENDOR=$(CURRENT_EXTENSION_VENDOR) COMPOSER_AUTH_JSON_LOCATION=$(COMPOSER_AUTH_JSON_LOCATION) make docker-start
 
@@ -58,16 +61,22 @@ COMPOSER_AUTH_JSON_LOCATION ?= './Dockerfile-assets/auth.json'
 2-4-5-p3:		# Launch 2.4.5-p3
 	MAGE_VERSION="2.4.5-p3" PHP_VERSION='8.1.6' COMPOSER_VERSION='composer22' MYSQL_VERSION="mysql:8.0.32-debian" ELASTICSEARCH_VERSION='docker.elastic.co/elasticsearch/elasticsearch:7.17.0' ELASTICSEARCH_OPTIONS='--elasticsearch-host elasticsearch --elasticsearch-port 9200' MAGENTO_PORT=1234 CURRENT_EXTENSION=$(CURRENT_EXTENSION)  CURRENT_EXTENSION_VENDOR=$(CURRENT_EXTENSION_VENDOR) COMPOSER_AUTH_JSON_LOCATION=$(COMPOSER_AUTH_JSON_LOCATION) make docker-start
 
+2-4-5-p4:		# Launch 2.4.5-p4
+	MAGE_VERSION="2.4.5-p4" PHP_VERSION='8.1.6' COMPOSER_VERSION='composer22' MYSQL_VERSION="mysql:8.0.32-debian" ELASTICSEARCH_VERSION='docker.elastic.co/elasticsearch/elasticsearch:7.17.0' ELASTICSEARCH_OPTIONS='--elasticsearch-host elasticsearch --elasticsearch-port 9200' MAGENTO_PORT=1234 CURRENT_EXTENSION=$(CURRENT_EXTENSION)  CURRENT_EXTENSION_VENDOR=$(CURRENT_EXTENSION_VENDOR) COMPOSER_AUTH_JSON_LOCATION=$(COMPOSER_AUTH_JSON_LOCATION) make docker-start
+
 2-4-6:			 # Launch 2.4.6
 	MAGE_VERSION="2.4.6" PHP_VERSION='8.2.2' COMPOSER_VERSION='composer22' MYSQL_VERSION="mysql:8.0.32-debian" ELASTICSEARCH_VERSION='docker.elastic.co/elasticsearch/elasticsearch:7.17.0' ELASTICSEARCH_OPTIONS='--search-engine elasticsearch7 --elasticsearch-host elasticsearch --elasticsearch-port 9200' MAGENTO_PORT=1234 CURRENT_EXTENSION=$(CURRENT_EXTENSION)  CURRENT_EXTENSION_VENDOR=$(CURRENT_EXTENSION_VENDOR) COMPOSER_AUTH_JSON_LOCATION=$(COMPOSER_AUTH_JSON_LOCATION) make docker-start
 
 2-4-6-p1:		# Launch 2.4.6-p1
 	MAGE_VERSION="2.4.6-p1" PHP_VERSION='8.2.2' COMPOSER_VERSION='composer22' MYSQL_VERSION="mysql:8.0.32-debian" ELASTICSEARCH_VERSION='docker.elastic.co/elasticsearch/elasticsearch:7.17.0' ELASTICSEARCH_OPTIONS='--search-engine elasticsearch7 --elasticsearch-host elasticsearch --elasticsearch-port 9200' MAGENTO_PORT=1234 CURRENT_EXTENSION=$(CURRENT_EXTENSION)  CURRENT_EXTENSION_VENDOR=$(CURRENT_EXTENSION_VENDOR) COMPOSER_AUTH_JSON_LOCATION=$(COMPOSER_AUTH_JSON_LOCATION) make docker-start
 
+2-4-6-p2:		# Launch 2.4.6-p2
+	MAGE_VERSION="2.4.6-p2" PHP_VERSION='8.2.2' COMPOSER_VERSION='composer22' MYSQL_VERSION="mysql:8.0.32-debian" ELASTICSEARCH_VERSION='docker.elastic.co/elasticsearch/elasticsearch:7.17.0' ELASTICSEARCH_OPTIONS='--search-engine elasticsearch7 --elasticsearch-host elasticsearch --elasticsearch-port 9200' MAGENTO_PORT=1234 CURRENT_EXTENSION=$(CURRENT_EXTENSION)  CURRENT_EXTENSION_VENDOR=$(CURRENT_EXTENSION_VENDOR) COMPOSER_AUTH_JSON_LOCATION=$(COMPOSER_AUTH_JSON_LOCATION) make docker-start
+
 2-4-7-beta1:	# Launch 2.4.7-beta1
 	MAGE_VERSION="2.4.7-beta1" PHP_VERSION='8.2.2' COMPOSER_VERSION='composer2' MYSQL_VERSION="mysql:8.0.32-debian" ELASTICSEARCH_VERSION='docker.elastic.co/elasticsearch/elasticsearch:7.17.0' ELASTICSEARCH_OPTIONS='--search-engine elasticsearch7 --elasticsearch-host elasticsearch --elasticsearch-port 9200' MAGENTO_PORT=1234 CURRENT_EXTENSION=$(CURRENT_EXTENSION)  CURRENT_EXTENSION_VENDOR=$(CURRENT_EXTENSION_VENDOR) COMPOSER_AUTH_JSON_LOCATION=$(COMPOSER_AUTH_JSON_LOCATION) make docker-start
 
-2-latest:			 # Launch the latest 2.x series
+2-latest:			 # Launch the latest stable 2.x series
 	PHP_VERSION='8.2.2' COMPOSER_VERSION='composer2' MYSQL_VERSION="mysql:8.0.32-debian" ELASTICSEARCH_VERSION='docker.elastic.co/elasticsearch/elasticsearch:7.17.0' ELASTICSEARCH_OPTIONS='--search-engine elasticsearch7 --elasticsearch-host elasticsearch --elasticsearch-port 9200' MAGENTO_PORT=1234 CURRENT_EXTENSION=$(CURRENT_EXTENSION)  CURRENT_EXTENSION_VENDOR=$(CURRENT_EXTENSION_VENDOR) COMPOSER_AUTH_JSON_LOCATION=$(COMPOSER_AUTH_JSON_LOCATION) make docker-start
 
 docker-start:       # Launch docker container