From 7b603cd095d625c4a9da290fb229114d6fc36016 Mon Sep 17 00:00:00 2001
From: Varun Patil <radialapps@gmail.com>
Date: Sat, 2 Dec 2023 21:58:28 -0800
Subject: [PATCH] ci: always run both static analysis steps

---
 .github/workflows/docs.yaml            |  2 +-
 .github/workflows/e2e.yaml             | 14 +++++++-------
 .github/workflows/go-vod.yml           |  2 +-
 .github/workflows/release.yaml         |  2 +-
 .github/workflows/static-analysis.yaml | 16 +++++++++-------
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index 49fb24b08..a7636bb45 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -15,7 +15,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v4
         with:
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index ebc1685b3..84ed2b98d 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -26,7 +26,7 @@ jobs:
           node-version: 20.x
 
       - name: Checkout the app
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build vue app
         run: |
@@ -62,14 +62,14 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
 
       - name: Checkout the app
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: apps/${{ env.APP_NAME }}
 
@@ -135,14 +135,14 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
 
       - name: Checkout the app
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: apps/${{ env.APP_NAME }}
 
@@ -194,14 +194,14 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
 
       - name: Checkout the app
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: apps/${{ env.APP_NAME }}
 
diff --git a/.github/workflows/go-vod.yml b/.github/workflows/go-vod.yml
index ef2b5c202..3249a18db 100644
--- a/.github/workflows/go-vod.yml
+++ b/.github/workflows/go-vod.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build
         working-directory: go-vod
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 605da11f6..938616b81 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -15,7 +15,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Node.js
         uses: actions/setup-node@v3
diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml
index f3130283f..49f6fc0ed 100644
--- a/.github/workflows/static-analysis.yaml
+++ b/.github/workflows/static-analysis.yaml
@@ -22,14 +22,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout server
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           repository: nextcloud/server
           ref: stable27
 
       - name: Checkout the app
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: apps/memories
 
@@ -46,22 +46,24 @@ jobs:
         run: |
           make install-tools
 
-      - name: Run Psalm
+      - name: Run PHP-CS-Fixer
+        if: ${{ ! cancelled() }}
         working-directory: apps/memories
         run: |
-          vendor/bin/psalm --no-cache --shepherd --stats --threads=max lib
+          vendor/bin/php-cs-fixer fix --dry-run --diff
 
-      - name: Run PHP-CS-Fixer
+      - name: Run Psalm
+        if: ${{ ! cancelled() }}
         working-directory: apps/memories
         run: |
-          vendor/bin/php-cs-fixer fix --dry-run --diff
+          vendor/bin/psalm --no-cache --shepherd --stats --threads=max lib
 
   vue-lint:
     name: Vue Lint
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the app
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install dependencies
         run: npm ci