Skip to content

Commit 7a184f7

Browse files
authored
Merge pull request #666 from nextcloud/chore/update_workflows
2 parents 55d647a + 2dc9635 commit 7a184f7

6 files changed

Lines changed: 20 additions & 13 deletions

File tree

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ jobs:
2525

2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
28+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2929
with:
3030
persist-credentials: false
3131

3232
- name: Set up php8.2
33-
uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2.33.0
33+
uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
3434
with:
3535
php-version: 8.2
3636
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
@@ -40,7 +40,9 @@ jobs:
4040
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4141

4242
- name: Install dependencies
43-
run: composer i
43+
run: |
44+
composer remove nextcloud/ocp --dev --no-scripts
45+
composer i
4446
4547
- name: Lint
4648
run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )

.github/workflows/lint-php.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ jobs:
2222
runs-on: ubuntu-latest
2323
strategy:
2424
matrix:
25-
php-versions: [ '8.1', '8.2', '8.3', '8.4' ]
25+
php-versions: [8.2', "8.3", "8.4"]
2626

2727
name: php-lint
2828

2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
31+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3232
with:
3333
persist-credentials: false
3434

3535
- name: Set up php ${{ matrix.php-versions }}
36-
uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2.33.0
36+
uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
3737
with:
3838
php-version: ${{ matrix.php-versions }}
3939
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: 2 additions & 2 deletions
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: nextcloud/pr-feedback-action@1883b38a033fb16f576875e0cf45f98b857655c4 # main
39+
- uses: nextcloud/pr-feedback-action@f0cab224dea8e1f282f9451de322f323c78fc7a5 # main
4040
with:
4141
feedback-message: |
4242
Hello there,
@@ -50,6 +50,6 @@ jobs:
5050
5151
(If you believe you should not receive this message, you can add yourself to the [blocklist](https://github.com/nextcloud/.github/blob/master/non-community-usernames.txt).)
5252
days-before-feedback: 14
53-
start-date: '2024-04-30'
53+
start-date: '2025-06-12'
5454
exempt-authors: '${{ steps.blocklist.outputs.blocklist }},${{ steps.scrape.outputs.users }}'
5555
exempt-bots: true

.github/workflows/psalm.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424
name: static-psalm-analysis
2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
27+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2828
with:
2929
persist-credentials: false
3030

3131
- name: Set up php8.2
32-
uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2.33.0
32+
uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
3333
with:
3434
php-version: 8.2
3535
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
@@ -41,7 +41,12 @@ jobs:
4141
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4242

4343
- name: Install dependencies
44-
run: composer i
44+
run: |
45+
composer remove nextcloud/ocp --dev --no-scripts
46+
composer i
47+
48+
- name: Check for vulnerable PHP dependencies
49+
run: composer require --dev roave/security-advisories:dev-latest
4550

4651
- name: Run coding standards check
4752
run: composer run psalm -- --threads=1 --monochrome --no-progress --output-format=github

.github/workflows/reuse.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest-low
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
22+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2323
with:
2424
persist-credentials: false
2525

tests/features/master.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ Feature: CLI updater - master base
99
And the version number is decreased in the config.php to enforce upgrade
1010
When the CLI updater is run successfully
1111
And the output should contain "Update successful"
12-
Then the installed version should be 32.0
12+
Then the installed version should be 33.0
1313
And maintenance mode should be off
1414
And upgrade is not required

0 commit comments

Comments
 (0)