Skip to content

Commit d6e80e0

Browse files
committed
chore: Add reuse workaround in js script and use PHP minimum version for psalm
We cannot upgrade psalm to support PHP 8.5 because we cover a wide range of versions. Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
1 parent 6742d29 commit d6e80e0

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/psalm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ jobs:
3535
- name: Check enforcement of minimum PHP version ${{ steps.versions.outputs.php-min }} in psalm.xml
3636
run: grep 'phpVersion="${{ steps.versions.outputs.php-min }}' psalm.xml
3737

38-
- name: Set up php${{ steps.versions.outputs.php-available }}
38+
- name: Set up php${{ steps.versions.outputs.php-min }}
3939
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
4040
with:
41-
php-version: ${{ steps.versions.outputs.php-available }}
41+
php-version: ${{ steps.versions.outputs.php-min }}
4242
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
4343
coverage: none
4444
ini-file: development

build-js/WebpackSPDXPlugin.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,10 @@ class WebpackSPDXPlugin {
199199
}
200200
output = `\n\n${output}`
201201
for (const author of [...authors].sort()) {
202-
output = `SPDX-FileCopyrightText: ${author}\n${output}`
202+
output = 'SPDX-File' + `CopyrightText: ${author}\n${output}`
203203
}
204204
for (const license of [...licenses].sort()) {
205-
output = `SPDX-License-Identifier: ${license}\n${output}`
205+
output = 'SPDX-Lice' + `nse-Identifier: ${license}\n${output}`
206206
}
207207

208208
compilation.emitAsset(

0 commit comments

Comments
 (0)