Merge pull request #1736 from github/update-v2.20.1-4385ad556

Merge main into releases/v2
github · Jun 21, 2023 · f6e388e · f6e388e
2 parents 6c089f5 + 2874247
commit f6e388e
Show file tree

Hide file tree

Showing 106 changed files with 26,850 additions and 29,005 deletions.
diff --git a/.github/actions/setup-swift/action.yml b/.github/actions/setup-swift/action.yml
@@ -24,10 +24,15 @@ runs:
           VERSION="null"
         else
           VERSION="$("$SWIFT_EXTRACTOR_DIR/tools/$PLATFORM/extractor" --version | awk '/version/ { print $3 }')"
-          # Specify 5.7.0, otherwise setup Action will default to latest minor version. 
+          # Specify 5.x.0, otherwise setup Action will default to latest minor version. 
           if [ $VERSION = "5.7" ]; then
             VERSION="5.7.0"
-          fi
+          elif [ $VERSION = "5.8" ]; then
+            VERSION="5.8.0"
+          # setup-swift does not yet support v5.8.1 Remove this when it does.
+          elif [ $VERSION = "5.8.1" ]; then
+            VERSION="5.8.0"
+          fi 
         fi
         echo "version=$VERSION" | tee -a $GITHUB_OUTPUT
 

diff --git a/.github/workflows/__resolve-environment-action.yml b/.github/workflows/__resolve-environment-action.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CodeQL Action Changelog
 
+## 2.20.1 - 21 Jun 2023
+
+- Update default CodeQL bundle version to 2.13.4. [#1721](https://github.com/github/codeql-action/pull/1721)
+- Experimental: add a new `resolve-environment` action which attempts to infer a configuration for the build environment that is required to build a given project. Do not use this in production as it is part of an internal experiment and subject to change at any time.
+
 ## 2.20.0 - 13 Jun 2023
 
 - Bump the version of the Action to 2.20.0. This ensures that users who received a Dependabot upgrade to [`cdcdbb5`](https://github.com/github/codeql-action/commit/cdcdbb579706841c47f7063dda365e292e5cad7a), which was mistakenly marked as Action version 2.13.4, continue to receive updates to the CodeQL Action. Full details in [#1729](https://github.com/github/codeql-action/pull/1729)

diff --git a/lib/actions-util.js b/lib/actions-util.js
diff --git a/lib/actions-util.js.map b/lib/actions-util.js.map
diff --git a/lib/actions-util.test.js b/lib/actions-util.test.js
diff --git a/lib/actions-util.test.js.map b/lib/actions-util.test.js.map
diff --git a/lib/api-compatibility.json b/lib/api-compatibility.json
@@ -1 +1 @@
-{ "maximumVersion": "3.10", "minimumVersion": "3.6" }
+{ "maximumVersion": "3.10", "minimumVersion": "3.5" }
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,6 +1,6 @@
 {
-    "bundleVersion": "codeql-bundle-20230524",
-    "cliVersion": "2.13.3",
-    "priorBundleVersion": "codeql-bundle-20230428",
-    "priorCliVersion": "2.13.1"
+    "bundleVersion": "codeql-bundle-v2.13.4",
+    "cliVersion": "2.13.4",
+    "priorBundleVersion": "codeql-bundle-20230524",
+    "priorCliVersion": "2.13.3"
 }
diff --git a/lib/init-action.js b/lib/init-action.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{ "maximumVersion": "3.10", "minimumVersion": "3.6" }
		{ "maximumVersion": "3.10", "minimumVersion": "3.5" }