Update CodeQL to v2 (#332)

* update codeql to v2 * auto patch increment * update for testing * move codeql so it works * update autobuild * enable debug logging * manually build * install java * reattempting autobuild * update gcloud to v2 * revert after testing * testing with just auth * typo * revert * testing without dependency caching * revert after testing caching * update cache to v3 --------- Co-authored-by: ras-rm-pr-bot <[email protected]>
ONSdigital · Jan 9, 2024 · eba5f3f · eba5f3f
1 parent 15cc064
commit eba5f3f
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 18 deletions.
diff --git a/codeql-analysis.yml → .github/workflows/codeql-analysis.yml b/codeql-analysis.yml → .github/workflows/codeql-analysis.yml
@@ -40,32 +40,47 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
+      with:
+        fetch-depth: '0'
+        token: ${{ secrets.BOT_TOKEN }}
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v1
+      with:
+        java-version: 17
+
+    - uses: actions/cache@v3
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+
+    - name: Authenticate with Google Cloud
+      id: auth
+      uses: google-github-actions/auth@v2
+      with:
+        credentials_json: ${{ secrets.GCR_KEY }}
+    - name: Setup Google Cloud SDK
+      uses: google-github-actions/setup-gcloud@v2
+    - name: Configure GCR
+      run: |
+        gcloud auth configure-docker
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # 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)
+      # 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@v1
-
-    # ℹ️ 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
+      uses: github/codeql-action/autobuild@v2
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/_infra/helm/collection-exercise/Chart.yaml b/_infra/helm/collection-exercise/Chart.yaml
@@ -14,9 +14,9 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 13.0.29
+version: 13.0.30
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 13.0.29
+appVersion: 13.0.30