Skip to content

Commit f288c36

Browse files
ci: bump super-linter from 6.8 to 7.2.1 and fix codebase (#1260)
1 parent 8cf6616 commit f288c36

File tree

7 files changed

+123
-213
lines changed

7 files changed

+123
-213
lines changed

.github/actions/watcher/action.yaml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,19 @@ description: Install e-dant/watcher
33
runs:
44
using: composite
55
steps:
6-
-
7-
name: Determine e-dant/watcher version
6+
- name: Determine e-dant/watcher version
87
id: determine-watcher-version
98
run: echo version="$(gh release view --repo e-dant/watcher --json tagName --template '{{ .tagName }}')" >> "${GITHUB_OUTPUT}"
109
shell: bash
1110
env:
1211
GH_TOKEN: ${{ github.token }}
13-
-
14-
name: Cache e-dant/watcher
12+
- name: Cache e-dant/watcher
1513
id: cache-watcher
1614
uses: actions/cache@v4
1715
with:
1816
path: watcher/target
1917
key: watcher-${{ runner.os }}-${{ runner.arch }}-${{ steps.determine-watcher-version.outputs.version }}-${{ env.CC && env.CC || 'gcc' }}
20-
-
21-
if: steps.cache-watcher.outputs.cache-hit != 'true'
18+
- if: steps.cache-watcher.outputs.cache-hit != 'true'
2219
name: Compile e-dant/watcher
2320
run: |
2421
mkdir watcher
@@ -30,8 +27,7 @@ runs:
3027
shell: bash
3128
env:
3229
GH_TOKEN: ${{ github.token }}
33-
-
34-
name: Update LD_LIBRARY_PATH
30+
- name: Update LD_LIBRARY_PATH
3531
run: |
3632
sudo sh -c "echo ${PWD}/watcher/target/lib > /etc/ld.so.conf.d/watcher.conf"
3733
sudo ldconfig

.github/dependabot.yaml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
---
22
version: 2
33
updates:
4-
-
5-
package-ecosystem: gomod
4+
- package-ecosystem: gomod
65
directory: /
76
schedule:
87
interval: weekly
98
commit-message:
109
prefix: chore
11-
-
12-
package-ecosystem: gomod
10+
- package-ecosystem: gomod
1311
directory: /caddy
1412
schedule:
1513
interval: weekly
@@ -18,12 +16,9 @@ updates:
1816
# These packages must be in sync with versions
1917
# used by github.com/caddyserver/caddy/v2
2018
ignore:
21-
-
22-
dependency-name: github.com/google/cel-go
23-
-
24-
dependency-name: github.com/quic-go/*
25-
-
26-
package-ecosystem: github-actions
19+
- dependency-name: github.com/google/cel-go
20+
- dependency-name: github.com/quic-go/*
21+
- package-ecosystem: github-actions
2722
directory: /
2823
schedule:
2924
interval: weekly

.github/workflows/docker.yaml

Lines changed: 30 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
branches:
99
- main
1010
paths-ignore:
11-
- 'docs/**'
11+
- "docs/**"
1212
push:
1313
branches:
1414
- main
@@ -18,11 +18,11 @@ on:
1818
inputs:
1919
#checkov:skip=CKV_GHA_7
2020
version:
21-
description: 'FrankenPHP version'
21+
description: "FrankenPHP version"
2222
required: false
2323
type: string
2424
schedule:
25-
- cron: '0 4 * * *'
25+
- cron: "0 4 * * *"
2626
permissions:
2727
contents: read
2828
env:
@@ -42,8 +42,7 @@ jobs:
4242
skip: ${{ steps.check.outputs.skip }}
4343
ref: ${{ steps.check.outputs.ref || (github.event_name == 'workflow_dispatch' && inputs.version) || '' }}
4444
steps:
45-
-
46-
name: Check PHP versions
45+
- name: Check PHP versions
4746
id: check
4847
env:
4948
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -77,17 +76,14 @@ jobs:
7776
echo ref="$(gh release view --repo dunglas/frankenphp --json tagName --jq '.tagName')"
7877
echo skip=false
7978
} >> "${GITHUB_OUTPUT}"
80-
-
81-
uses: actions/checkout@v4
79+
- uses: actions/checkout@v4
8280
if: ${{ !fromJson(steps.check.outputs.skip) }}
8381
with:
8482
ref: ${{ steps.check.outputs.ref }}
85-
-
86-
name: Set up Docker Buildx
83+
- name: Set up Docker Buildx
8784
if: ${{ !fromJson(steps.check.outputs.skip) }}
8885
uses: docker/setup-buildx-action@v3
89-
-
90-
name: Create variants matrix
86+
- name: Create variants matrix
9187
if: ${{ !fromJson(steps.check.outputs.skip) }}
9288
id: matrix
9389
shell: bash
@@ -114,55 +110,44 @@ jobs:
114110
variant: ${{ fromJson(needs.prepare.outputs.variants) }}
115111
platform: ${{ fromJson(needs.prepare.outputs.platforms) }}
116112
include:
117-
-
118-
race: ""
113+
- race: ""
119114
qemu: true
120-
-
121-
platform: linux/amd64
115+
- platform: linux/amd64
122116
qemu: false
123117
race: "-race" # The Go race detector is only supported on amd64
124-
-
125-
platform: linux/386
118+
- platform: linux/386
126119
qemu: false
127120
exclude:
128121
# arm/v6 is only available for Alpine: https://github.com/docker-library/golang/issues/502
129-
-
130-
variant: php-${{ needs.prepare.outputs.php82_version }}-bookworm
122+
- variant: php-${{ needs.prepare.outputs.php82_version }}-bookworm
131123
platform: linux/arm/v6
132-
-
133-
variant: php-${{ needs.prepare.outputs.php83_version }}-bookworm
124+
- variant: php-${{ needs.prepare.outputs.php83_version }}-bookworm
134125
platform: linux/arm/v6
135126
steps:
136-
-
137-
name: Prepare
127+
- name: Prepare
138128
id: prepare
139129
run: |
140130
platform=${{ matrix.platform }}
141131
echo "sanitized_platform=${platform//\//-}" >> "${GITHUB_OUTPUT}"
142-
-
143-
uses: actions/checkout@v4
132+
- uses: actions/checkout@v4
144133
with:
145134
ref: ${{ needs.prepare.outputs.ref }}
146-
-
147-
name: Set up QEMU
135+
- name: Set up QEMU
148136
if: matrix.qemu
149137
uses: docker/setup-qemu-action@v3
150138
with:
151139
platforms: ${{ matrix.platform }}
152-
-
153-
name: Set up Docker Buildx
140+
- name: Set up Docker Buildx
154141
uses: docker/setup-buildx-action@v3
155142
with:
156143
platforms: ${{ matrix.platform }}
157-
-
158-
name: Login to DockerHub
144+
- name: Login to DockerHub
159145
if: fromJson(needs.prepare.outputs.push)
160146
uses: docker/login-action@v3
161147
with:
162148
username: ${{ secrets.REGISTRY_USERNAME }}
163149
password: ${{ secrets.REGISTRY_PASSWORD }}
164-
-
165-
name: Build
150+
- name: Build
166151
id: build
167152
uses: docker/bake-action@v5
168153
with:
@@ -187,8 +172,7 @@ jobs:
187172
SHA: ${{ github.sha }}
188173
VERSION: ${{ (github.ref_type == 'tag' && github.ref_name) || needs.prepare.outputs.ref || 'dev' }}
189174
PHP_VERSION: ${{ needs.prepare.outputs.php_version }}
190-
-
191-
# Workaround for https://github.com/actions/runner/pull/2477#issuecomment-1501003600
175+
- # Workaround for https://github.com/actions/runner/pull/2477#issuecomment-1501003600
192176
name: Export metadata
193177
if: fromJson(needs.prepare.outputs.push)
194178
run: |
@@ -201,26 +185,23 @@ jobs:
201185
touch "/tmp/metadata/runner/${runnerDigest#sha256:}"
202186
env:
203187
METADATA: ${{ steps.build.outputs.metadata }}
204-
-
205-
name: Upload builder metadata
188+
- name: Upload builder metadata
206189
if: fromJson(needs.prepare.outputs.push)
207190
uses: actions/upload-artifact@v4
208191
with:
209192
name: metadata-builder-${{ matrix.variant }}-${{ steps.prepare.outputs.sanitized_platform }}
210193
path: /tmp/metadata/builder/*
211194
if-no-files-found: error
212195
retention-days: 1
213-
-
214-
name: Upload runner metadata
196+
- name: Upload runner metadata
215197
if: fromJson(needs.prepare.outputs.push)
216198
uses: actions/upload-artifact@v4
217199
with:
218200
name: metadata-runner-${{ matrix.variant }}-${{ steps.prepare.outputs.sanitized_platform }}
219201
path: /tmp/metadata/runner/*
220202
if-no-files-found: error
221203
retention-days: 1
222-
-
223-
name: Run tests
204+
- name: Run tests
224205
if: ${{ !matrix.qemu && !fromJson(needs.prepare.outputs.push) }}
225206
run: |
226207
docker run --platform=${{ matrix.platform }} --rm \
@@ -230,7 +211,7 @@ jobs:
230211
METADATA: ${{ steps.build.outputs.metadata }}
231212
# Adapted from https://docs.docker.com/build/ci/github-actions/multi-platform/
232213
push:
233-
runs-on: ubuntu-latest
214+
runs-on: ubuntu-latest
234215
needs:
235216
- prepare
236217
- build
@@ -239,26 +220,22 @@ jobs:
239220
fail-fast: false
240221
matrix:
241222
variant: ${{ fromJson(needs.prepare.outputs.variants) }}
242-
target: ['builder', 'runner']
223+
target: ["builder", "runner"]
243224
steps:
244-
-
245-
name: Download metadata
225+
- name: Download metadata
246226
uses: actions/download-artifact@v4
247227
with:
248228
pattern: metadata-${{ matrix.target }}-${{ matrix.variant }}-*
249229
path: /tmp/metadata
250230
merge-multiple: true
251-
-
252-
name: Set up Docker Buildx
231+
- name: Set up Docker Buildx
253232
uses: docker/setup-buildx-action@v3
254-
-
255-
name: Login to DockerHub
233+
- name: Login to DockerHub
256234
uses: docker/login-action@v3
257235
with:
258236
username: ${{ secrets.REGISTRY_USERNAME }}
259237
password: ${{ secrets.REGISTRY_PASSWORD }}
260-
-
261-
name: Create manifest list and push
238+
- name: Create manifest list and push
262239
working-directory: /tmp/metadata
263240
run: |
264241
set -x
@@ -267,10 +244,9 @@ jobs:
267244
$(printf "${IMAGE_NAME}@sha256:%s " *)
268245
env:
269246
METADATA: ${{ needs.prepare.outputs.metadata }}
270-
-
271-
name: Inspect image
247+
- name: Inspect image
272248
run: |
273249
# shellcheck disable=SC2046,SC2086
274-
docker buildx imagetools inspect $(jq -cr '.target."${{ matrix.target }}-${{ matrix.variant }}".tags | first' <<< ${METADATA})
250+
docker buildx imagetools inspect $(jq -cr '.target."${{ matrix.target }}-${{ matrix.variant }}".tags | first' <<< ${METADATA})
275251
env:
276252
METADATA: ${{ needs.prepare.outputs.metadata }}

.github/workflows/lint.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,18 @@ on:
1010
permissions:
1111
contents: read
1212
packages: read
13-
statuses: write
13+
statuses: write
1414
jobs:
1515
build:
1616
name: Lint Code Base
1717
runs-on: ubuntu-latest
1818
steps:
19-
-
20-
name: Checkout Code
19+
- name: Checkout Code
2120
uses: actions/checkout@v4
2221
with:
2322
fetch-depth: 0
24-
-
25-
name: Lint Code Base
26-
uses: super-linter/super-linter/slim@v6.8.0
23+
- name: Lint Code Base
24+
uses: super-linter/super-linter/slim@v7.2.1
2725
env:
2826
VALIDATE_ALL_CODEBASE: true
2927
DEFAULT_BRANCH: main
@@ -38,6 +36,9 @@ jobs:
3836
VALIDATE_PHP_PHPSTAN: false
3937
VALIDATE_PHP_PSALM: false
4038
VALIDATE_TERRAGRUNT: false
39+
VALIDATE_DOCKERFILE_HADOLINT: false
4140
# Prettier and StandardJS are incompatible
4241
VALIDATE_JAVASCRIPT_PRETTIER: false
4342
VALIDATE_TYPESCRIPT_PRETTIER: false
43+
# Conflicts with MARKDOWN
44+
VALIDATE_MARKDOWN_PRETTIER: false

0 commit comments

Comments
 (0)