Merge branch 'develop' for v4.6.3

EasyEngine · Dec 19, 2022 · 4127dd1 · 4127dd1
2 parents 76a1af7 + 203974d
commit 4127dd1
Show file tree

Hide file tree

Showing 5 changed files with 191 additions and 414 deletions.
diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml
@@ -12,20 +12,27 @@ on:
 name: Build 🔨 + Test 👨‍🔧
 
 jobs:
-
   build: #---------------------------------------------------------------------
     name: Build Phar
     runs-on: ubuntu-latest
     steps:
       - name: Check out source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+          coverage: none
+          tools: composer
+          extensions: pcntl, curl, sqlite3, zip, dom, mbstring, json
 
       - name: Get Composer cache directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Set up Composer caching
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         env:
           cache-name: cache-composer-dependencies
         with:
@@ -34,14 +41,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-composer-
 
-      - name: Set up PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '7.4'
-          coverage: none
-          tools: composer
-          extensions: pcntl, curl, sqlite3, zip, dom, mbstring, json
-
       - name: Install dependencies
         run: |
           cd "$GITHUB_WORKSPACE"
@@ -69,7 +68,7 @@ jobs:
 
 
       - name: Upload EE version
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: cli_version
           path: VERSION
@@ -81,7 +80,7 @@ jobs:
         run: sudo ./easyengine.phar cli info
 
       - name: Upload built Phar file
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: easyengine-phar
           path: easyengine.phar
@@ -96,14 +95,22 @@ jobs:
         php: ['7.2', '7.3', '7.4', '8.0', '8.1']
     steps:
     - name: Check out source code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
+
+    - name: Set up PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '${{ matrix.php }}'
+        coverage: none
+        tools: composer
+        extensions: pcntl, curl, sqlite3, zip, dom, mbstring, json
 
     - name: Get Composer cache directory
       id: composer-cache
-      run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
     - name: Set up Composer caching
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: cache-composer-dependencies
       with:
@@ -112,14 +119,6 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-composer-
 
-    - name: Set up PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: '${{ matrix.php }}'
-        coverage: none
-        tools: composer
-        extensions: pcntl, curl, sqlite3, zip, dom, mbstring, json
-
     - name: Update docker
       run: |
         sudo apt purge nginx nginx-common docker docker-engine docker.io docker-ce containerd runc
@@ -180,13 +179,13 @@ jobs:
 
     steps:
       - name: Check out builds repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: easyengine/easyengine-builds
           token: ${{ secrets.BOT_TOKEN }}
 
       - name: Download built Phar file
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: easyengine-phar
 
@@ -236,14 +235,14 @@ jobs:
 
     steps:
     - name: Check out source code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Download built Phar file
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: easyengine-phar
 
-    - name : Create hashes
+    - name: Create hashes
       run: |
         md5sum easyengine.phar | cut -d ' ' -f 1 > easyengine.phar.md5
         sha512sum easyengine.phar | cut -d ' ' -f 1 > easyengine.phar.sha512
@@ -256,7 +255,7 @@ jobs:
 
     - name: Get tag
       id: tag
-      run: echo ::set-output name=tag::${GITHUB_REF/refs\/tags\//}
+      run: echo tag=${GITHUB_REF/refs\/tags\//} >> $GITHUB_OUTPUT
 
     - name: Release
       uses: softprops/action-gh-release@v1
@@ -266,5 +265,6 @@ jobs:
           easyengine.phar
           easyengine.phar.md5
           easyengine.phar.sha512
+        draft: true
         name: EasyEngine ${{ steps.tag.outputs.tag }}
         token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.6.2
+4.6.3
diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
         "easyengine/shell-command": "v1.1.1",
         "easyengine/site-command": "v3.2.1",
         "easyengine/site-type-php": "v1.7.0",
-        "easyengine/site-type-wp": "v1.7.0",
+        "easyengine/site-type-wp": "v1.7.1",
         "monolog/monolog": "1.24.0",
         "mustache/mustache": "2.14.1",
         "rmccue/requests": "1.8.0",