Merge pull request #77 from webful-ltd/codeql-2025

CodeQL updates

.github/workflows/codeql-analysis.yml

@@ -12,71 +12,59 @@ on:
     - cron: '0 5 * * 0'
 
 jobs:
-  analyze:
-    name: Analyze
+  analyse-ts:
+    name: Analyse TypeScript
     runs-on: ubuntu-latest
+    steps:
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          # We must fetch at least the immediate parents so that if this is
+          # a pull request then we can checkout the head.
+          fetch-depth: 2
+      - name: Globally install Ionic and Capacitor
+        run: npm install -g @ionic/cli @capacitor/cli
+      - name: Install dependencies
+        run: npm install
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          build-mode: none
+          languages: javascript # includes TS
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
 
+  analyse-java:
+    name: Analyse Java
+    runs-on: ubuntu-latest
     steps:
     - name: Setup Java JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'adopt'
-
     - name: Setup Node
       uses: actions/setup-node@v4
       with:
         node-version: '22'
-
     - name: Checkout repository
       uses: actions/checkout@v4
       with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
         fetch-depth: 2
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-
     - name: Globally install Ionic and Capacitor
       run: npm install -g @ionic/cli @capacitor/cli
-
     - name: Install dependencies
       run: npm install
-
     - name: Ionic build android
       run: ionic cap build android --no-open
-
-    # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3
       with:
-        languages: javascript, java # includes TS
-        java-version: 17
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
-      with:
-        languages: javascript, java # includes TS
-        java-version: 17
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
+        build-mode: autobuild
+        languages: java
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v3
-      with:
-        languages: javascript, java # includes TS
-        java-version: 17