update tests to exercise root action

.github/workflows/codeql.yml

@@ -26,3 +26,26 @@ jobs:
         languages: javascript
         config-file: ./.github/codeql/codeql-config.yml
     - uses: ./analyze
+  
+  test-root-action:
+    strategy:
+      matrix:
+        os: [ubuntu-latest,windows-latest,macos-latest]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        # Must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head of the pull request.
+        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' }}
+
+    - uses: github/codeql-action@${{ 'testing_testing' }}
+      with:
+        languages: javascript
+        config-file: ./.github/codeql/codeql-config.yml

.github/workflows/integration-testing.yml

@@ -14,11 +14,10 @@ jobs:
         mkdir ../action
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .
-    - uses: ./../action/init
     - name: Build code
       shell: bash
       run: ./build.sh
-    - uses: ./../action/analyze
+    - uses: ./../action
       env:
         TEST_MODE: true
     - run: |
@@ -51,14 +50,13 @@ jobs:
         mkdir ../action
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .
-    - uses: ./../action/init
-      with:
-        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
       shell: bash
       run: ./build.sh
-    - uses: ./../action/analyze
+    - uses: ./../action
+      with:
+        languages: cpp,csharp,java,javascript,python
+        config-file: github/codeql-action/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{ github.sha }}
       env:
         TEST_MODE: true
 
@@ -82,14 +80,13 @@ jobs:
         mkdir ../action
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .
-    - uses: ./../action/init
-      with:
-        languages: go
-        config-file: ./tests/multi-language-repo/.github/codeql/custom-queries.yml
     - name: Build code
       shell: bash
       run: ./build.sh
-    - uses: ./../action/analyze
+    - uses: ./../action
+      with:
+        languages: go
+        config-file: ./tests/multi-language-repo/.github/codeql/custom-queries.yml
       env:
         TEST_MODE: true
 
@@ -144,9 +141,8 @@ jobs:
         mkdir ../action
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .
-    - uses: ./../action/init
+    - uses: ./../action
       with:
         languages: javascript
-    - uses: ./../action/analyze
       env:
         TEST_MODE: true