Skip to content

Commit

Permalink
Merge branch 'develop' into phpstan
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.lock
  • Loading branch information
sreichel committed Dec 14, 2024
2 parents 0ba907a + 6efd115 commit 3ba1ff9
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ jobs:
overwrite: true

- name: Run update tasks on files.magerun.net
uses: appleboy/ssh-action@v1.1.0
uses: appleboy/ssh-action@v1.2.0
with:
host: ${{ secrets.SSH_DEPLOY_HOST }}
username: ${{ secrets.SSH_DEPLOY_USERNAME }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-magento-open-source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
COMPOSER_VENDOR_PATH : "${{ github.workspace }}/magento/vendor"

- name: Report coverage
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
file: ./build/coverage/clover.xml # Or your specific coverage file

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-openmage-20.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
COMPOSER_VENDOR_PATH : "${{ github.workspace }}/magento/vendor"

- name: Report coverage
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
file: ./build/coverage/clover.xml

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-openmage-20.1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
continue-on-error: true

- name: Report coverage
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
file: ./build/coverage/clover.xml

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-openmage-20.10.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
COMPOSER_VENDOR_PATH : "${{ github.workspace }}/magento/vendor"

- name: Report coverage
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
file: ./build/coverage/clover.xml

Expand Down

0 comments on commit 3ba1ff9

Please sign in to comment.