Skip to content

Commit 6f902fa

Browse files
committed
Yaml: various tweaks for compliance with Yamllint and actionlint
1 parent d0ab564 commit 6f902fa

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

.github/workflows/quicktest.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- php: '5.4'
3333
phpcs_version: '3.1.0'
3434

35-
name: "QTest${{ matrix.lint && ' + Lint' || '' }}: PHP ${{ matrix.php }} - PHPCS ${{ matrix.phpcs_version }}"
35+
name: "QTest${{ matrix.phpcs_version == 'dev-master' && ' + Lint' || '' }}: PHP ${{ matrix.php }} - PHPCS ${{ matrix.phpcs_version }}"
3636

3737
steps:
3838
- name: Checkout code
@@ -98,12 +98,16 @@ jobs:
9898

9999
- name: Grab PHPUnit version
100100
id: phpunit_version
101+
# yamllint disable rule:line-length
101102
run: echo "VERSION=$(vendor/bin/phpunit --version | grep --only-matching --max-count=1 --extended-regexp '\b[0-9]+\.[0-9]+')" >> "$GITHUB_OUTPUT"
103+
# yamllint enable rule:line-length
102104

103105
- name: Determine PHPUnit composer script to use
104106
id: phpunit_script
105107
run: |
106-
if [ "${{ startsWith( steps.phpunit_version.outputs.VERSION, '10.' ) || startsWith( steps.phpunit_version.outputs.VERSION, '11.' ) }}" == "true" ]; then
108+
if [ "${{ startsWith( steps.phpunit_version.outputs.VERSION, '11.' ) }}" == "true" ]; then
109+
echo 'SUFFIX=' >> "$GITHUB_OUTPUT"
110+
elif [ "${{ startsWith( steps.phpunit_version.outputs.VERSION, '10.' ) }}" == "true" ]; then
107111
echo 'SUFFIX=' >> "$GITHUB_OUTPUT"
108112
else
109113
echo 'SUFFIX=-lte9' >> "$GITHUB_OUTPUT"

.github/workflows/test.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,16 @@ jobs:
158158

159159
- name: Grab PHPUnit version
160160
id: phpunit_version
161+
# yamllint disable rule:line-length
161162
run: echo "VERSION=$(vendor/bin/phpunit --version | grep --only-matching --max-count=1 --extended-regexp '\b[0-9]+\.[0-9]+')" >> "$GITHUB_OUTPUT"
163+
# yamllint enable rule:line-length
162164

163165
- name: Determine PHPUnit composer script to use
164166
id: phpunit_script
165167
run: |
166-
if [ "${{ startsWith( steps.phpunit_version.outputs.VERSION, '10.' ) || startsWith( steps.phpunit_version.outputs.VERSION, '11.' ) }}" == "true" ]; then
168+
if [ "${{ startsWith( steps.phpunit_version.outputs.VERSION, '11.' ) }}" == "true" ]; then
169+
echo 'SUFFIX=' >> "$GITHUB_OUTPUT"
170+
elif [ "${{ startsWith( steps.phpunit_version.outputs.VERSION, '10.' ) }}" == "true" ]; then
167171
echo 'SUFFIX=' >> "$GITHUB_OUTPUT"
168172
else
169173
echo 'SUFFIX=-lte9' >> "$GITHUB_OUTPUT"

.github/workflows/update-website.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ jobs:
9494
build_dir: 'deploy'
9595
target_branch: 'gh-pages'
9696
keep_history: true
97-
#allow_empty_commit: false # Turn on after verification that it all works as expected.
97+
allow_empty_commit: false
9898
jekyll: true
9999
commit_message: ${{ steps.commit_msg.outputs.MSG }}
100100
dry_run: ${{ steps.base_branch.outputs.BRANCH != 'stable' }}
101-
verbose: ${{ matrix.verbose }}
101+
verbose: false
102102
env:
103103
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

phpstan.neon.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
parameters:
2-
#phpVersion: 50400 # Needs to be 70100 or higher... sigh...
2+
# phpVersion: 50400 # Needs to be 70100 or higher... sigh...
33
level: 6
44
paths:
55
- bin

0 commit comments

Comments
 (0)