Merge pull request #839 from github/revert-837-aeisenberg/cli-2.7.3

aeisenberg · web-flow · commit cbed0358c693 · 2021-12-08T10:58:53.000-08:00
Revert "Bump default CodeQL version to 2.7.3"
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -370,9 +370,6 @@ jobs:
         run: |
           ../action/runner/dist/codeql-runner-macos init --repository $GITHUB_REPOSITORY --languages csharp --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
 
-      - name: Initialize dotnet
-        run: dotnet restore
-
       - name: Build code
         shell: bash
         run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## [UNRELEASED]
 
-- Update default CodeQL bundle version to 2.7.3. [#837](https://github.com/github/codeql-action/pull/837)
+No user facing changes.
 
 ## 1.0.25 - 06 Dec 2021
 
diff --git a/lib/codeql.js b/lib/codeql.js
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
diff --git a/lib/defaults.json b/lib/defaults.json
@@ -1,3 +1,3 @@
 {
-    "bundleVersion": "codeql-bundle-20211207"
+    "bundleVersion": "codeql-bundle-20211122"
 }
diff --git a/src/codeql.ts b/src/codeql.ts
@@ -732,17 +732,7 @@ async function getCodeQLForCmd(
         "-Dmaven.wagon.http.pool=false",
       ].join(" ");
 
-      const runnerExecutable = process.env["CODEQL_RUNNER"] || "";
-      // On Mac, prefixing with the runner executable is required to handle System Integrity Protection.
-      if (runnerExecutable) {
-        // Earlier steps (init) are expected to have written the runner executable path
-        // to the tracing environment, and the current step is expected to have
-        // correctly loaded that environment.
-        await runTool(runnerExecutable, [autobuildCmd]);
-      } else {
-        // Fallback in case CODEQL_RUNNER wasn't correctly set or loaded.
-        await runTool(autobuildCmd);
-      }
+      await runTool(autobuildCmd);
     },
     async extractScannedLanguage(databasePath: string, language: Language) {
       // Get extractor location
diff --git a/src/defaults.json b/src/defaults.json
@@ -1,3 +1,3 @@
 {
-  "bundleVersion": "codeql-bundle-20211207"
+  "bundleVersion": "codeql-bundle-20211122"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "bundleVersion": "codeql-bundle-20211207"`
	`2`	`+ "bundleVersion": "codeql-bundle-20211122"`
`3`	`3`	`}`