Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/command-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:

steps:
- name: Checkout ${{ needs.init.outputs.head_ref }}
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
token: ${{ secrets.COMMAND_BOT_PAT }}
fetch-depth: 0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ftp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['7.4', '8.0']
php-versions: ['8.0']
ftpd: ['proftpd', 'vsftpd', 'pure-ftpd']

name: php${{ matrix.php-versions }}-${{ matrix.ftpd }}

steps:
- name: Checkout server
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Read package.json node and npm engines version
uses: skjnldsv/[email protected]
Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/lint-php-cs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This workflow is provided via the organization template repository
#
# https://github.com/nextcloud/.github
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization

name: Lint

on: pull_request

permissions:
contents: read

concurrency:
group: lint-php-cs-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
lint:
runs-on: ubuntu-latest

name: php-cs

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Set up php
uses: shivammathur/setup-php@v2
with:
php-version: "8.0"
coverage: none

- name: Install dependencies
run: composer i

- name: Lint
run: composer run cs:check || ( echo "Please run `composer run cs:fix` to format your code" && exit 1 )
57 changes: 57 additions & 0 deletions .github/workflows/lint-php.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# This workflow is provided via the organization template repository
#
# https://github.com/nextcloud/.github
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization

name: Lint

on:
pull_request:
push:
branches:
- main
- master
- stable*

permissions:
contents: read

concurrency:
group: lint-php-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
php-lint:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ["8.0", "8.1", "8.2"]

name: php-lint

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
coverage: none

- name: Lint
run: composer run lint

summary:
permissions:
contents: none
runs-on: ubuntu-latest
needs: php-lint

if: always()

name: php-lint-summary

steps:
- name: Summary status
run: if ${{ needs.php-lint.result != "success" && needs.php-lint.result != "skipped" }}; then exit 1; fi
42 changes: 0 additions & 42 deletions .github/workflows/lint.yml

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/node-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Read package.json node and npm engines version
uses: skjnldsv/[email protected]
Expand All @@ -31,7 +31,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up node ${{ needs.versions.outputs.nodeVersion }}
uses: actions/setup-node@v2
Expand All @@ -53,7 +53,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up node ${{ needs.versions.outputs.nodeVersion }}
uses: actions/setup-node@v2
Expand All @@ -75,7 +75,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up node ${{ needs.versions.outputs.nodeVersion }}
uses: actions/setup-node@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/oci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
php-versions: [ '7.4', '8.0', '8.1']
php-versions: ['8.0', '8.1']

services:
oracle:
Expand Down
65 changes: 53 additions & 12 deletions .github/workflows/psalm-github.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Psalm show github
name: Psalm

on:
pull_request:
Expand All @@ -8,21 +8,62 @@ on:
- stable*

jobs:
psalm:
name: Psalm
generate-report:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Checkout
uses: actions/checkout@v3
with:
submodules: true

- name: Set up php
uses: shivammathur/setup-php@v2
with:
submodules: recursive
php-version: '8.0'
extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
coverage: none

- name: Composer install
run: composer i

- name: Psalm
uses: docker://vimeo/psalm-github-actions:4.9.3
# Make sure we pass and still upload the report
continue-on-error: true
run: composer run psalm -- --monochrome --no-progress --output-format=github --report=psalm.sarif

- name: Upload report to GitHub
if: always()
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: psalm.sarif

generate-security-report:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3
with:
composer_ignore_platform_reqs: false
report_file: results.sarif
- name: Upload Analysis results to GitHub
uses: github/codeql-action/upload-sarif@v1
submodules: true

- name: Set up php
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
coverage: none

- name: Composer install
run: composer i

- name: Psalm
# Make sure we pass and still upload the report
continue-on-error: true
run: composer run psalm -- --monochrome --no-progress --output-format=github --taint-analysis --report=psalm.sarif

- name: Upload report to GitHub
if: always()
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: results.sarif
sarif_file: psalm.sarif
28 changes: 0 additions & 28 deletions .github/workflows/psalm-security.yml

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/s3-external.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['7.4', '8.0']
php-versions: ['8.0', '8.1']

name: php${{ matrix.php-versions }}-minio

Expand All @@ -36,7 +36,7 @@ jobs:

steps:
- name: Checkout server
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: true

Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['7.4', '8.0']
php-versions: ['8.0', '8.1']

name: php${{ matrix.php-versions }}-localstack

Expand All @@ -85,7 +85,7 @@ jobs:

steps:
- name: Checkout server
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/s3-primary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

steps:
- name: Checkout server
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: true

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/smb-kerberos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: ['7.4', '8.0']
php-versions: ['8.0', '8.1']

name: php${{ matrix.php-versions }}-${{ matrix.ftpd }}

steps:
- name: Checkout server
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: true
- name: Pull images
Expand Down
Loading