From 1f3a9c6337287040e233d91e60593ad41d782731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6?= Date: Thu, 4 Nov 2021 11:02:17 +0100 Subject: [PATCH 1/2] [stable22] Update update-psalm-baseline workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ --- .github/workflows/update-psalm-baseline.yml | 34 ++++++++++++--------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/workflows/update-psalm-baseline.yml b/.github/workflows/update-psalm-baseline.yml index 943e1f509d335..3816fd4027d3c 100644 --- a/.github/workflows/update-psalm-baseline.yml +++ b/.github/workflows/update-psalm-baseline.yml @@ -1,42 +1,45 @@ name: Update Psalm baseline on: + workflow_dispatch: schedule: - cron: '5 4 * * *' jobs: update-psalm-baseline: runs-on: ubuntu-latest + steps: - uses: actions/checkout@v2 - - name: Checkout submodules - shell: bash - run: | - auth_header="$(git config --local --get http.https://github.com/.extraheader)" - git submodule sync --recursive - git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 + with: + submodules: true + - name: Set up php7.4 - uses: shivammathur/setup-php@master + uses: shivammathur/setup-php@v2 with: php-version: 7.4 extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip coverage: none + - name: Composer install - run: composer i + run: composer install + - name: Psalm run: composer run psalm -- --monochrome --no-progress --output-format=text --update-baseline - - name: Reset composer.json and composer.lock + continue-on-error: true + + - name: Reset composer run: | - rm -rf lib/composer - git checkout -- composer.json composer.lock lib/composer + git clean -f lib/composer + git checkout composer.json composer.lock lib/composer + - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: - token: ${{ secrets.MACHINE_USER_PAT }} - push-to-fork: nextcloud-pr-bot/server + token: ${{ secrets.COMMAND_BOT_PAT }} commit-message: Update psalm baseline committer: GitHub - author: Nextcloud-PR-Bot + author: nextcloud-command signoff: true branch: automated/noid/psalm-baseline-update title: '[Automated] Update psalm-baseline.xml' @@ -44,4 +47,5 @@ jobs: Auto-generated update psalm-baseline.xml with fixed psalm warnings labels: | automated pr - reviewers: juliushaertl, artonge, kesselb + 3. to review + team-reviewers: server-backend From 91ad520de943b1c60d31627c306e18c9ccac2476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6?= Date: Thu, 4 Nov 2021 11:42:34 +0100 Subject: [PATCH 2/2] Add branch-suffix to update-psalm-baseline PR creation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ --- .github/workflows/update-psalm-baseline.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/update-psalm-baseline.yml b/.github/workflows/update-psalm-baseline.yml index 3816fd4027d3c..b5b38cd888b1c 100644 --- a/.github/workflows/update-psalm-baseline.yml +++ b/.github/workflows/update-psalm-baseline.yml @@ -42,6 +42,8 @@ jobs: author: nextcloud-command signoff: true branch: automated/noid/psalm-baseline-update + # Make sure we can open multiple PRs + branch-suffix: timestamp title: '[Automated] Update psalm-baseline.xml' body: | Auto-generated update psalm-baseline.xml with fixed psalm warnings