Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
274a79c
Updated references to MigrationException
Jul 14, 2023
55e56e9
Add PHP 8.3 to tests
Feb 27, 2025
1db94fc
Dependency update
Feb 27, 2025
21704f3
Upgrade to upload and download artifact v4
Feb 27, 2025
7237e43
Resolve deprecations in tests
Feb 27, 2025
3206b8c
Stop printing script content in normal output and instead show a prog…
Feb 27, 2025
2e732bb
Upgrade to upload and download artifact v4
Feb 27, 2025
246f838
Update free disk space check to be based on package size
Mar 3, 2025
ab3eacb
Upgrade jadu style and cs fixer
Mar 3, 2025
90ec971
CS fixes
Mar 3, 2025
33a993e
Upgrade to upload and download artifact v4
Feb 27, 2025
e5d04b0
Use CS rules compatible with php 7.4
Mar 3, 2025
0130544
Upgrade to upload and download artifact v4
Feb 27, 2025
8a0ba01
Merge branch 'MET-130' into MET-127
Mar 4, 2025
4553fbd
Upgrade to upload and download artifact v4
Feb 27, 2025
d7669a6
Merge branch 'release/4.1' into MET-126
Mar 6, 2025
27af49e
Merge branch 'release/4.1' into MET-127
Mar 6, 2025
9660b66
Merge branch 'release/4.1' into MET-128
Mar 6, 2025
b025c8a
Merge branch 'release/4.1' into MET-129
Mar 6, 2025
77a19fc
Merge branch 'release/4.1' into MET-130
Mar 6, 2025
d00b94d
Merge pull request #171 from jadu/MET-130
dgudgeon Mar 7, 2025
c9e3c80
Merge branch 'release/4.1' into MET-127
Mar 7, 2025
abbca49
Changes following review
Mar 10, 2025
ea2638e
cs fix
Mar 10, 2025
bfbfb28
Merge pull request #167 from jadu/MET-126
dgudgeon Mar 12, 2025
3bf17fa
Merge branch 'release/4.1' into MET-128
Mar 12, 2025
abb1211
Merge pull request #168 from jadu/MET-128
dgudgeon Mar 12, 2025
a0e653b
Remove unnecessary isset
Mar 12, 2025
80d19ea
Merge branch 'release/4.1' into MET-129
Mar 12, 2025
357bde0
cs fix
Mar 12, 2025
c807116
Merge pull request #170 from jadu/MET-127
dgudgeon Mar 13, 2025
fa6d5f6
Merge pull request #169 from jadu/MET-129
dgudgeon Mar 13, 2025
ce07759
Update CHANGELOG.md
dgudgeon Mar 13, 2025
2ab86d8
Run github actions for tags
May 2, 2025
9d011fd
Merge branch 'release/4.1' of github.com:jadu/meteor into release/4.1
May 2, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
push:
branches:
- "master"
tags:
- "*"
pull_request:
branches:
- "master"
Expand Down Expand Up @@ -52,6 +54,7 @@ jobs:
php-version:
- '7.4'
- '8.1'
- '8.3'

steps:
- uses: shivammathur/setup-php@v2
Expand Down Expand Up @@ -85,7 +88,7 @@ jobs:
steps:
- uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: '8.3'
- uses: actions/checkout@v3
- name: Cache Composer packages
id: composer-cache
Expand All @@ -106,10 +109,11 @@ jobs:
files: "bin/meteor.phar"
fail: true
- name: Store the artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: meteor.phar
path: bin/meteor.phar
overwrite: true

package-for-testing:
name: Create test package
Expand All @@ -125,7 +129,7 @@ jobs:
url: "https://gist.githubusercontent.com/DenisYaschuk/d3ade2d88d058cf9c971cf9d1f580a0f/raw/871ee04ee0ee01a6a2e0f97e67ce0206f78e3179/migrations-update.php"
target: tests/mock_project/package
- name: Copy meteor to mock project
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: meteor.phar
path: "tests/mock_project/package"
Expand Down Expand Up @@ -156,10 +160,11 @@ jobs:
target: "tests/mock_project/package/output/github-action-test_2.0/github-action-test_2.0"

- name: Store the mock project artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: mock_project
path: tests/mock_project
overwrite: true

functional-tests:
name: Functional Tests
Expand All @@ -176,6 +181,7 @@ jobs:
php-version:
- '7.4'
- '8.1'
- '8.3'

needs: package-for-testing
steps:
Expand All @@ -184,7 +190,7 @@ jobs:
php-version: ${{ matrix.php-version }}

- name: Retrieve the mock project
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: mock_project
path: mock_project
Expand Down
3 changes: 3 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
[
'no_superfluous_phpdoc_tags' => false,
'fully_qualified_strict_types' => false,
'trailing_comma_in_multiline' => [
'elements' => ['arrays']
],
]
)
);
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## v4.1.0

**Features**
* [MET-128] Added PHP 8.3 support ([#168](https://github.com/jadu/meteor/pull/168))
* [MET-127] Required disk space check is now based on package size ([#170](https://github.com/jadu/meteor/pull/170))
* [MET-129] Suppress output when running scripts and replace with progress bar ([#169](https://github.com/jadu/meteor/pull/169))

**Fixes**
* [MET-126] Updated references to MigrationException to prevent fatal error ([#167](https://github.com/jadu/meteor/pull/167))
* [MET-130] Fix PHP CS Fixer in pipeline ([#171](https://github.com/jadu/meteor/pull/171))

## v4.0.0

* Added PHP 8 support
Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
"phpunit/phpunit": "^9.5",
"mockery/mockery": "^1.5",
"mikey179/vfsstream": "*",
"friendsofphp/php-cs-fixer": "^2.0",
"jadu/php-style": "~1.2"
"jadu/php-style": "^2.0"
},
"autoload": {
"psr-4": {
Expand Down
Loading
Loading