Merge branch 'develop' for v4.6.2

EasyEngine · Nov 17, 2022 · 76a1af7 · 76a1af7
2 parents 666431d + 17fb939
commit 76a1af7
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 7 deletions.
diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml
@@ -46,7 +46,7 @@ jobs:
         run: |
           cd "$GITHUB_WORKSPACE"
           # Run composer install for master else update.
-          if [[ "$GITHUB_REF" = "refs/heads/master" ]]; then
+          if [[ "$GITHUB_REF" = "refs/heads/master" ]] || [[ "$GITHUB_REF" = "refs/tags/"* ]]; then
               composer install --no-dev --no-progress --no-interaction
           else
               sed -i 's/\(easyengine\/.*\):\ \".*\"/\1:\ \"dev-develop\"/' composer.json

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.6.1
+4.6.2
diff --git a/composer.json b/composer.json
@@ -27,6 +27,7 @@
         "php": ">=7.0",
         "composer/composer": "2.2.12",
         "composer/semver": "3.2.4",
+        "daverandom/libdns": "^2.0",
         "easyengine/admin-tools-command": "v1.1.0",
         "easyengine/auth-command": "v1.2.0",
         "easyengine/config-command": "v1.0.2",

diff --git a/composer.lock b/composer.lock
diff --git a/img-versions.json b/img-versions.json
@@ -3,15 +3,15 @@
     "easyengine/mailhog": "v4.0.0",
     "easyengine/mariadb": "v4.1.3",
     "easyengine/nginx-proxy": "v4.5.0",
-    "easyengine/nginx": "v4.6.0",
+    "easyengine/nginx": "v4.6.2",
     "easyengine/php": "v4.6.0",
     "easyengine/php5.6": "v4.6.0",
     "easyengine/php7.0": "v4.6.0",
     "easyengine/php7.2": "v4.6.0",
     "easyengine/php7.3": "v4.6.0",
-    "easyengine/php7.4": "v4.6.0",
-    "easyengine/php8.0": "v4.6.0",
-    "easyengine/php8.1": "v4.6.0",
+    "easyengine/php7.4": "v4.6.2",
+    "easyengine/php8.0": "v4.6.2",
+    "easyengine/php8.1": "v4.6.2",
     "easyengine/postfix": "v4.1.5",
     "easyengine/redis": "v4.4.3",
     "easyengine/newrelic-daemon": "v4.3.0"

diff --git a/utils/make-phar.php b/utils/make-phar.php
@@ -175,6 +175,7 @@ function get_composer_versions( $current_version ) {
 	->in(EE_VENDOR_DIR . '/symfony/polyfill-php80')
 	->in(EE_VENDOR_DIR . '/symfony/polyfill-php81')
 	->in(EE_VENDOR_DIR . '/monolog')
+	->in(EE_VENDOR_DIR . '/daverandom')
 	->in(EE_VENDOR_DIR . '/guzzlehttp')
 	->in(EE_VENDOR_DIR . '/ralouphie/getallheaders')
 	->in(EE_VENDOR_DIR . '/acmephp')