Skip to content

Commit dbc8cd2

Browse files
marcelklehrmarcelklehr
authored
Merge pull request #38 from nextcloud/fix/update-github-actions
fix(ci): Update github actions
2 parents d0bdf2d + 3809bc1 commit dbc8cd2

File tree

9 files changed

+53
-18
lines changed

9 files changed

+53
-18
lines changed

‎.github/dependabot.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
2+
# SPDX-License-Identifier: AGPL-3.0-or-later
3+
version: 2
4+
updates:
5+
- package-ecosystem: composer
6+
directory: "/"
7+
schedule:
8+
interval: weekly
9+
day: saturday
10+
time: "03:00"
11+
timezone: Europe/Paris
12+
open-pull-requests-limit: 10
13+
- package-ecosystem: npm
14+
directory: "/"
15+
schedule:
16+
interval: weekly
17+
day: saturday
18+
time: "03:00"
19+
timezone: Europe/Paris
20+
open-pull-requests-limit: 10
21+
- package-ecosystem: "github-actions"
22+
directory: "/"
23+
schedule:
24+
interval: weekly
25+
day: saturday
26+
time: "03:00"
27+
timezone: Europe/Paris
28+
open-pull-requests-limit: 10

‎.github/workflows/appstore-build-publish.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
- name: Get app version number
4444
id: app-version
45-
uses: skjnldsv/xpath-action@7e6a7c379d0e9abc8acaef43df403ab4fc4f770c # master
45+
uses: skjnldsv/xpath-action@f5b036e9d973f42c86324833fd00be90665fbf77 # master
4646
with:
4747
filename: ${{ env.APP_NAME }}/appinfo/info.xml
4848
expression: "//info//version/text()"
@@ -53,7 +53,7 @@ jobs:
5353
5454
- name: Get appinfo data
5555
id: appinfo
56-
uses: skjnldsv/xpath-action@7e6a7c379d0e9abc8acaef43df403ab4fc4f770c # master
56+
uses: skjnldsv/xpath-action@f5b036e9d973f42c86324833fd00be90665fbf77 # master
5757
with:
5858
filename: ${{ env.APP_NAME }}/appinfo/info.xml
5959
expression: "//info//dependencies//nextcloud/@min-version"
@@ -87,7 +87,7 @@ jobs:
8787
filename: ${{ env.APP_NAME }}/appinfo/info.xml
8888

8989
- name: Set up php ${{ steps.php-versions.outputs.php-min }}
90-
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
90+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
9191
with:
9292
php-version: ${{ steps.php-versions.outputs.php-min }}
9393
coverage: none
@@ -152,31 +152,32 @@ jobs:
152152
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
153153
if: ${{ steps.server-checkout.outcome != 'success' }}
154154
with:
155+
persist-credentials: false
155156
submodules: true
156157
repository: nextcloud/server
157158
path: nextcloud
158159

159160
- name: Sign app
160161
run: |
161162
# Extracting release
162-
cd ${{ env.APP_NAME }}/build/artifacts/appstore
163+
cd ${{ env.APP_NAME }}/build/artifacts
163164
tar -xvf ${{ env.APP_NAME }}.tar.gz
164-
cd ../../../../
165+
cd ../../../
165166
# Setting up keys
166167
echo '${{ secrets.APP_PRIVATE_KEY }}' > ${{ env.APP_NAME }}.key
167168
wget --quiet "https://github.com/nextcloud/app-certificate-requests/raw/master/${{ env.APP_NAME }}/${{ env.APP_NAME }}.crt"
168169
# Signing
169-
php nextcloud/occ integrity:sign-app --privateKey=../${{ env.APP_NAME }}.key --certificate=../${{ env.APP_NAME }}.crt --path=../${{ env.APP_NAME }}/build/artifacts/appstore/${{ env.APP_NAME }}
170+
php nextcloud/occ integrity:sign-app --privateKey=../${{ env.APP_NAME }}.key --certificate=../${{ env.APP_NAME }}.crt --path=../${{ env.APP_NAME }}/build/artifacts/${{ env.APP_NAME }}
170171
# Rebuilding archive
171-
cd ${{ env.APP_NAME }}/build/artifacts/appstore
172+
cd ${{ env.APP_NAME }}/build/artifacts
172173
tar -zcvf ${{ env.APP_NAME }}.tar.gz ${{ env.APP_NAME }}
173174
174175
- name: Attach tarball to github release
175176
uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd # v2
176177
id: attach_to_release
177178
with:
178179
repo_token: ${{ secrets.GITHUB_TOKEN }}
179-
file: ${{ env.APP_NAME }}/build/artifacts/appstore/${{ env.APP_NAME }}.tar.gz
180+
file: ${{ env.APP_NAME }}/build/artifacts/${{ env.APP_NAME }}.tar.gz
180181
asset_name: ${{ env.APP_NAME }}-${{ env.APP_VERSION }}.tar.gz
181182
tag: ${{ github.ref }}
182183
overwrite: true

‎.github/workflows/integration-test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535
fail-fast: false
3636
matrix:
3737
php-versions: [ '8.1' ]
38-
server-versions: [ 'stable30', 'stable31' ]
38+
server-versions: [ 'master', 'stable31', 'stable30' ]
3939

4040
name: Integration test
4141

4242
steps:
4343
- name: Checkout nextcloud
44-
uses: actions/checkout@v3
44+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4545
with:
4646
path: server
4747
repository: nextcloud/server
@@ -81,7 +81,7 @@ jobs:
8181
sqlite3 data/owncloud.db "INSERT INTO oc_appconfig ( appid, configkey, configvalue) VALUES ('integration_dropbox', 'client_secret', '$OAUTH_CLIENT_SECRET');"
8282
8383
- name: Checkout app
84-
uses: actions/checkout@v3
84+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8585
with:
8686
path: server/apps/${{ env.APP_NAME }}
8787

‎.github/workflows/lint-php-cs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ jobs:
3333
id: versions
3434
uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
3535

36-
- name: Set up php${{ steps.versions.outputs.php-available }}
37-
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
36+
- name: Set up php${{ steps.versions.outputs.php-min }}
37+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
3838
with:
39-
php-version: ${{ steps.versions.outputs.php-available }}
39+
php-version: ${{ steps.versions.outputs.php-min }}
4040
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
4141
coverage: none
4242
ini-file: development

‎.github/workflows/lint-php.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
persist-credentials: false
4949

5050
- name: Set up php ${{ matrix.php-versions }}
51-
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
51+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
5252
with:
5353
php-version: ${{ matrix.php-versions }}
5454
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite

‎.github/workflows/pr-feedback.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
blocklist=$(curl https://raw.githubusercontent.com/nextcloud/.github/master/non-community-usernames.txt | paste -s -d, -)
3737
echo "blocklist=$blocklist" >> "$GITHUB_OUTPUT"
3838
39-
- uses: marcelklehr/pr-feedback-action@1883b38a033fb16f576875e0cf45f98b857655c4
39+
- uses: nextcloud/pr-feedback-action@1883b38a033fb16f576875e0cf45f98b857655c4 # main
4040
with:
4141
feedback-message: |
4242
Hello there,

‎.github/workflows/psalm-matrix.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ jobs:
3838
id: versions
3939
uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
4040

41+
- name: Check enforcement of minimum PHP version ${{ steps.versions.outputs.php-min }} in psalm.xml
42+
run: grep 'phpVersion="${{ steps.versions.outputs.php-min }}' psalm.xml
43+
4144
static-analysis:
4245
runs-on: ubuntu-latest
4346
needs: matrix
@@ -54,12 +57,14 @@ jobs:
5457
persist-credentials: false
5558

5659
- name: Set up php${{ matrix.php-versions }}
57-
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
60+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
5861
with:
5962
php-version: ${{ matrix.php-versions }}
6063
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
6164
coverage: none
6265
ini-file: development
66+
# Temporary workaround for missing pcntl_* in PHP 8.3
67+
ini-values: disable_functions=
6368
env:
6469
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6570

‎appinfo/info.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<bugs>https://github.com/nextcloud/integration_dropbox/issues</bugs>
2121
<screenshot>https://github.com/nextcloud/integration_dropbox/raw/master/img/screenshot1.jpg</screenshot>
2222
<dependencies>
23-
<nextcloud min-version="28" max-version="31"/>
23+
<nextcloud min-version="28" max-version="32"/>
2424
</dependencies>
2525
<commands>
2626
<command>OCA\Dropbox\Command\StartImport</command>

‎psalm.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
resolveFromConfigFile="true"
1010
findUnusedBaselineEntry="true"
1111
findUnusedCode="false"
12+
phpVersion="8.0"
1213
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1314
xmlns="https://getpsalm.org/schema/config"
1415
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

0 commit comments

Comments
 (0)