Skip to content

Commit 5b6282e

Browse files
henrymercerhenrymercer
authored
Merge pull request #1829 from github/update-v2.21.3-f9a7c6738
Merge main into releases/v2
2 parents 0ba4244 + f0f7a35 commit 5b6282e

File tree

1,582 files changed

+28167
-10743
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,582 files changed

+28167
-10743
lines changed

‎.github/actions/prepare-test/action.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@ name: "Prepare test"
22
description: Performs some preparation to run tests
33
inputs:
44
version:
5-
description: "The version of the CodeQL CLI to use. Can be 'latest', 'cached', 'nightly-latest', 'nightly-YYYY-MM-DD', or 'stable-YYYY-MM-DD'."
5+
description: "The version of the CodeQL CLI to use. Can be 'latest', 'default', 'nightly-latest', 'nightly-YYYY-MM-DD', or 'stable-YYYY-MM-DD'."
66
required: true
7+
use-all-platform-bundle:
8+
description: "If true, we output a tools URL with codeql-bundle.tar.gz file rather than platform-specific URL"
9+
default: 'false'
10+
required: false
711
outputs:
812
tools-url:
913
description: "The value that should be passed as the 'tools' input of the 'init' step."
@@ -24,7 +28,9 @@ runs:
2428
run: |
2529
set -e # Fail this Action if `gh release list` fails.
2630
27-
if [[ "$RUNNER_OS" == "Linux" ]]; then
31+
if [[ ${{ inputs.use-all-platform-bundle }} == "true" ]]; then
32+
artifact_name="codeql-bundle.tar.gz"
33+
elif [[ "$RUNNER_OS" == "Linux" ]]; then
2834
artifact_name="codeql-bundle-linux64.tar.gz"
2935
elif [[ "$RUNNER_OS" == "macOS" ]]; then
3036
artifact_name="codeql-bundle-osx64.tar.gz"
@@ -46,7 +52,7 @@ runs:
4652
echo "tools-url=https://github.com/github/codeql-action/releases/download/codeql-bundle-$version/$artifact_name" >> $GITHUB_OUTPUT
4753
elif [[ ${{ inputs.version }} == "latest" ]]; then
4854
echo "tools-url=latest" >> $GITHUB_OUTPUT
49-
elif [[ ${{ inputs.version }} == "cached" ]]; then
55+
elif [[ ${{ inputs.version }} == "default" ]]; then
5056
echo "tools-url=" >> $GITHUB_OUTPUT
5157
else
5258
echo "::error::Unrecognized version specified!"

‎.github/actions/setup-swift/action.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: "Set up Swift"
2-
description: Sets up an appropriate Swift version if supported on this platform.
1+
name: "Set up Swift on Linux"
2+
description: Sets up an appropriate Swift version on Linux.
33
inputs:
44
codeql-path:
55
description: Path to the CodeQL CLI executable.
@@ -9,21 +9,16 @@ runs:
99
steps:
1010
- name: Get Swift version
1111
id: get_swift_version
12-
if: runner.os != 'Windows'
12+
if: runner.os == 'Linux'
1313
shell: bash
1414
env:
1515
CODEQL_PATH: ${{ inputs.codeql-path }}
1616
run: |
17-
if [[ $RUNNER_OS = "macOS" ]]; then
18-
PLATFORM="osx64"
19-
else # We do not run this step on Windows.
20-
PLATFORM="linux64"
21-
fi
2217
SWIFT_EXTRACTOR_DIR="$("$CODEQL_PATH" resolve languages --format json | jq -r '.swift[0]')"
2318
if [ $SWIFT_EXTRACTOR_DIR = "null" ]; then
2419
VERSION="null"
2520
else
26-
VERSION="$("$SWIFT_EXTRACTOR_DIR/tools/$PLATFORM/extractor" --version | awk '/version/ { print $3 }')"
21+
VERSION="$("$SWIFT_EXTRACTOR_DIR/tools/linux64/extractor" --version | awk '/version/ { print $3 }')"
2722
# Specify 5.x.0, otherwise setup Action will default to latest minor version.
2823
if [ $VERSION = "5.7" ]; then
2924
VERSION="5.7.0"
@@ -37,6 +32,6 @@ runs:
3732
echo "version=$VERSION" | tee -a $GITHUB_OUTPUT
3833
3934
- uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf # Please update the corresponding SHA in the CLI's CodeQL Action Integration Test.
40-
if: runner.os != 'Windows' && steps.get_swift_version.outputs.version != 'null'
35+
if: runner.os == 'Linux' && steps.get_swift_version.outputs.version != 'null'
4136
with:
4237
swift-version: "${{ steps.get_swift_version.outputs.version }}"

‎.github/workflows/__all-platform-bundle.yml

Lines changed: 67 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__analyze-ref-input.yml

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__autobuild-action.yml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__config-export.yml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__diagnostics-export.yml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__export-file-baseline-information.yml

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__extractor-ram-threads.yml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__go-custom-queries.yml

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy