Move CodeQL to default pipeline

2 files changed, 28 insertions, 63 deletions

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 5700a0dce..c7ab0935f 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -2,17 +2,14 @@ name: Android CI
 
 on: [push, pull_request]
 jobs:
-  validation:
-    name: Validate Gradle Wrapper
+  Validate Gradle Wrapper:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: gradle/wrapper-validation-action@v1
 
-  test:
-    name: Unit tests
-    runs-on: ubuntu-18.04
-
+  Unit tests:
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: set up JDK 1.8
@@ -22,10 +19,8 @@ jobs:
       - name: Unit tests
         run: bash ./gradlew test --stacktrace
 
-  instrumented:
-    name: Android instrumented tests
+  Android instrumented tests:
     runs-on: macos-latest
-
     steps:
       - uses: actions/checkout@v2
       - name: set up JDK 1.8
@@ -38,10 +33,31 @@ jobs:
           api-level: 29
           script: ./gradlew connectDevDebugAndroidTest --stacktrace
 
-  apk:
-    name: Generate APK
-    runs-on: ubuntu-18.04
+  CodeQL-Build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        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: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: java
+      - run: bash ./gradlew assembleDev --stacktrace
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1
+
+  Generate APK:
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: set up JDK 1.8
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
deleted file mode 100644
index 5377e0d83..000000000
--- a/.github/workflows/codeql-analysis.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: "Code scanning - action"
-
-on:
-  push:
-  pull_request:
-  # schedule:
-  #   - cron: '0 11 * * 0'
-
-jobs:
-  CodeQL-Build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      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' }}
-      
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: java
-
-    # 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: bash ./gradlew assembleDev --stacktrace
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1