Skip to content

Commit

Permalink
Merge branch 'develop' for v4.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mrrobot47 committed Nov 26, 2024
2 parents 2de40ba + d645c70 commit 5347cc4
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 40 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/test_and_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Set up PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.3'
coverage: none
tools: composer
extensions: pcntl, curl, sqlite3, zip, dom, mbstring, json
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:


- name: Upload EE version
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cli_version
path: VERSION
Expand All @@ -80,7 +80,7 @@ jobs:
run: sudo ./easyengine.phar cli info

- name: Upload built Phar file
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: easyengine-phar
path: easyengine.phar
Expand All @@ -92,7 +92,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
php: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
steps:
- name: Check out source code
uses: actions/checkout@v3
Expand Down Expand Up @@ -187,7 +187,7 @@ jobs:
token: ${{ secrets.BOT_TOKEN }}

- name: Download built Phar file
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: easyengine-phar

Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:
uses: actions/checkout@v3

- name: Download built Phar file
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: easyengine-phar

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.7.6
4.8.0
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
"easyengine/mailhog-command": "v1.0.3",
"easyengine/service-command": "v1.6.1",
"easyengine/shell-command": "v1.1.3",
"easyengine/site-command": "v3.3.2",
"easyengine/site-type-php": "v1.8.1",
"easyengine/site-type-wp": "v1.8.2",
"easyengine/site-command": "v3.3.3",
"easyengine/site-type-php": "v1.9.0",
"easyengine/site-type-wp": "v1.9.0",
"monolog/monolog": "1.24.0",
"mustache/mustache": "2.14.1",
"rmccue/requests": "1.8.0",
Expand Down
48 changes: 24 additions & 24 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions img-versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@
"easyengine/cron": "v4.7.3",
"easyengine/mailhog": "v4.6.5",
"easyengine/mariadb": "v4.6.6",
"easyengine/nginx-proxy": "v4.7.6",
"easyengine/nginx-proxy": "v4.8.0",
"easyengine/nginx": "v4.7.6",
"easyengine/php": "v4.6.6",
"easyengine/php5.6": "v4.7.4",
"easyengine/php7.0": "v4.7.4",
"easyengine/php7.2": "v4.7.4",
"easyengine/php7.3": "v4.7.4",
"easyengine/php7.4": "v4.7.4",
"easyengine/php8.0": "v4.7.4",
"easyengine/php8.1": "v4.7.5",
"easyengine/php8.2": "v4.7.6",
"easyengine/php8.3": "v4.7.6",
"easyengine/postfix": "v4.7.4",
"easyengine/php8.0": "v4.8.0",
"easyengine/php8.1": "v4.8.0",
"easyengine/php8.2": "v4.8.0",
"easyengine/php8.3": "v4.8.0",
"easyengine/php8.4": "v4.8.0",
"easyengine/postfix": "v4.8.0",
"easyengine/redis": "v4.7.6",
"easyengine/newrelic-daemon": "v4.7.4"
}

0 comments on commit 5347cc4

Please sign in to comment.