Integration tests now both rely on pre-downloaded and latest codeql b…

…undles
github · Sep 22, 2020 · 3b90db9 · 3b90db9
1 parent 41464b1
commit 3b90db9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -10,6 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest,windows-latest,macos-latest]
+        tools: [~, latest]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -26,6 +27,7 @@ jobs:
 
     - uses: ./init
       with:
+        tools: ${{ matrix.tools }}
         languages: javascript
         config-file: ./.github/codeql/codeql-config.yml
     - uses: ./analyze
diff --git a/.github/workflows/integration-testing.yml b/.github/workflows/integration-testing.yml
@@ -7,6 +7,9 @@ on:
 
 jobs:
   multi-language-repo_test-autodetect-languages:
+    strategy:
+      matrix:
+        tools: [~, latest]
     runs-on: ubuntu-latest
 
     steps:
@@ -18,6 +21,8 @@ jobs:
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .
     - uses: ./../action/init
+      with:
+        tools: ${{ matrix.tools }}
     - name: Build code
       shell: bash
       run: ./build.sh
@@ -44,6 +49,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
+        tools: [~, latest]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -56,6 +62,7 @@ jobs:
         mv ../action/tests/multi-language-repo/{*,.github} .
     - uses: ./../action/init
       with:
+        tools: ${{ matrix.tools }}
         languages: cpp,csharp,java,javascript,python
         config-file: github/codeql-action/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{ github.sha }}
     - name: Build code
@@ -71,6 +78,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
+        tools: [~, latest]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -87,6 +95,7 @@ jobs:
         mv ../action/tests/multi-language-repo/{*,.github} .
     - uses: ./../action/init
       with:
+        tools: ${{ matrix.tools }}
         languages: go
         config-file: ./.github/codeql/custom-queries.yml
     - name: Build code
@@ -128,6 +137,9 @@ jobs:
         TEST_MODE: true
 
   test-proxy:
+    strategy:
+      matrix:
+        tools: [~, latest]
     runs-on: ubuntu-latest
     container:
       image: ubuntu:18.04
@@ -149,6 +161,7 @@ jobs:
         mv ../action/tests/multi-language-repo/{*,.github} .
     - uses: ./../action/init
       with:
+        tools: ${{ matrix.tools }}
         languages: javascript
     - uses: ./../action/analyze
       env: