Skip to content

Commit 3f42c8a

Browse files
committed
GH Actions: various other small tweaks
* Ensure all steps have a name. * Update a few links in inline comments as the old URLs are no longer valid. * Fix a non-LF line ending. * Small indentation fix. * Be more specific about what Composer can ignore when installing. Ref: https://blog.packagist.com/composer-2-2/#-ignore-platform-req-improvements
1 parent 5ebe9ee commit 3f42c8a

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

.github/workflows/label-new-prs.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: srvaroa/labeler@master
16-
env:
17-
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
15+
- uses: srvaroa/labeler@master
16+
env:
17+
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/phpstan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
# Install dependencies and handle caching in one go.
3737
# Dependencies need to be installed to make sure the PHPUnit classes are recognized.
38-
# @link https://github.com/marketplace/actions/install-composer-dependencies
38+
# @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
3939
- name: Install Composer dependencies
4040
uses: "ramsey/composer-install@v2"
4141
with:

.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
jshint
131131
132132
# Install dependencies and handle caching in one go.
133-
# @link https://github.com/marketplace/actions/install-composer-dependencies
133+
# @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
134134
- name: Install Composer dependencies - normal
135135
if: ${{ matrix.php < '8.0' }}
136136
uses: "ramsey/composer-install@v2"
@@ -143,7 +143,7 @@ jobs:
143143
if: ${{ matrix.php >= '8.0' }}
144144
uses: "ramsey/composer-install@v2"
145145
with:
146-
composer-options: --ignore-platform-reqs
146+
composer-options: --ignore-platform-req=php+
147147
custom-cache-suffix: $(date -u "+%Y-%m")
148148

149149
# Note: The code style check is run multiple times against every PHP version

.github/workflows/validate.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,17 @@ jobs:
2929
uses: actions/checkout@v3
3030

3131
- name: Install xmllint
32-
run: |
33-
sudo apt-get update
32+
run: |
33+
sudo apt-get update
3434
sudo apt-get install --no-install-recommends -y libxml2-utils
3535
3636
- name: Retrieve XML Schema
3737
run: curl -O https://www.w3.org/2012/04/XMLSchema.xsd
3838

3939
# Show XML violations inline in the file diff.
4040
# @link https://github.com/marketplace/actions/xmllint-problem-matcher
41-
- uses: korelstar/xmllint-problem-matcher@v1
41+
- name: Enable showing XML issues inline
42+
uses: korelstar/xmllint-problem-matcher@v1
4243

4344
# Validate the XML ruleset files.
4445
# @link http://xmlsoft.org/xmllint.html

0 commit comments

Comments
 (0)