From 4fb6f30abbbc71bf47f39f47b386023e707e669b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 3 Jan 2023 13:33:49 +0100 Subject: [PATCH 1/2] chore(CI): Improve rate limit situation when installing phpunit Signed-off-by: Joas Schilling --- .github/workflows/ftp.yml | 2 ++ .github/workflows/lint.yml | 6 ++++++ .github/workflows/oci.yml | 2 ++ .github/workflows/performance.yml | 2 ++ .github/workflows/psalm-github.yml | 15 ++++++++++++++- .github/workflows/s3-external.yml | 4 ++++ .github/workflows/s3-primary.yml | 2 ++ .github/workflows/static-code-analysis.yml | 5 +++++ .github/workflows/update-psalm-baseline.yml | 2 ++ 9 files changed, 39 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ftp.yml b/.github/workflows/ftp.yml index aa9fe3aad7913..f0b3918f187d4 100644 --- a/.github/workflows/ftp.yml +++ b/.github/workflows/ftp.yml @@ -45,6 +45,8 @@ jobs: php-version: ${{ matrix.php-versions }} tools: phpunit extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Set up Nextcloud run: | diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 983b0af6d93e5..025596806c32c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,6 +17,9 @@ jobs: php-version: ${{ matrix.php-versions }} extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip coverage: none + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Lint run: composer run lint @@ -33,6 +36,9 @@ jobs: extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip coverage: none tools: cs2pr + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Install dependencies run: composer i - name: Run coding standards check diff --git a/.github/workflows/oci.yml b/.github/workflows/oci.yml index adcc48dc90dbd..ef1782342ed4f 100644 --- a/.github/workflows/oci.yml +++ b/.github/workflows/oci.yml @@ -36,6 +36,8 @@ jobs: extensions: ctype, curl, dom, fileinfo, gd, imagick, intl, json, mbstring, oci8, openssl, pdo_sqlite, posix, sqlite, xml, zip tools: phpunit:9 coverage: none + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Set up Nextcloud run: | diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index e5cbac5fe8faa..cc19978c44e00 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -26,6 +26,8 @@ jobs: php-version: ${{ matrix.php-versions }} tools: phpunit extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Set up Nextcloud run: | diff --git a/.github/workflows/psalm-github.yml b/.github/workflows/psalm-github.yml index d27e0a1f14371..1e7daac35db45 100644 --- a/.github/workflows/psalm-github.yml +++ b/.github/workflows/psalm-github.yml @@ -15,7 +15,20 @@ jobs: - name: Checkout code uses: actions/checkout@v2 with: - submodules: recursive + 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 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Composer install + run: composer i + - name: Psalm uses: docker://vimeo/psalm-github-actions:4.9.3 continue-on-error: true diff --git a/.github/workflows/s3-external.yml b/.github/workflows/s3-external.yml index 8c2cdd7cfd1c9..93f1d717e2558 100644 --- a/.github/workflows/s3-external.yml +++ b/.github/workflows/s3-external.yml @@ -46,6 +46,8 @@ jobs: php-version: ${{ matrix.php-versions }} tools: phpunit extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Set up Nextcloud run: | @@ -95,6 +97,8 @@ jobs: php-version: ${{ matrix.php-versions }} tools: phpunit extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Set up Nextcloud run: | diff --git a/.github/workflows/s3-primary.yml b/.github/workflows/s3-primary.yml index a6ee0970adaa4..e3a1acb1e4820 100644 --- a/.github/workflows/s3-primary.yml +++ b/.github/workflows/s3-primary.yml @@ -40,6 +40,8 @@ jobs: php-version: ${{ matrix.php-versions }} tools: phpunit extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Set up Nextcloud run: | diff --git a/.github/workflows/static-code-analysis.yml b/.github/workflows/static-code-analysis.yml index 31ee0f89fa203..917c3ee2f4c53 100644 --- a/.github/workflows/static-code-analysis.yml +++ b/.github/workflows/static-code-analysis.yml @@ -19,6 +19,9 @@ jobs: php-version: 7.4 extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip coverage: none + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Composer install run: composer i - name: Psalm @@ -45,6 +48,8 @@ jobs: php-version: 7.4 extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip coverage: none + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Composer install run: composer i - name: Psalm diff --git a/.github/workflows/update-psalm-baseline.yml b/.github/workflows/update-psalm-baseline.yml index 5e699f623afce..a05d73f4a789b 100644 --- a/.github/workflows/update-psalm-baseline.yml +++ b/.github/workflows/update-psalm-baseline.yml @@ -28,6 +28,8 @@ jobs: php-version: 7.4 extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip coverage: none + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Composer install run: composer install From 409cf24698eb993373bc5ef617162549ee774ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6?= Date: Wed, 4 Jan 2023 17:22:20 +0100 Subject: [PATCH 2/2] Fix indent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ --- .github/workflows/lint.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 025596806c32c..cd059b4dff568 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,8 +17,8 @@ jobs: php-version: ${{ matrix.php-versions }} extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip coverage: none - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Lint run: composer run lint @@ -36,8 +36,8 @@ jobs: extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip coverage: none tools: cs2pr - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Install dependencies run: composer i