Skip to content

Commit 2c0ca85

Browse files
committed
Update CodeQL Path in PR checks
1 parent 31aec7e commit 2c0ca85

8 files changed

+36
-10
lines changed

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

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

.github/workflows/__multi-language-autodetect.yml

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

.github/workflows/__swift-autobuild.yml

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

.github/workflows/__swift-custom-build.yml

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

pr-checks/checks/export-file-baseline-information.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@ steps:
1111
CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: true
1212
- name: Get Swift version
1313
id: get_swift_version
14+
# We don't support Swift on Windows
15+
if: runner.os != 'Windows'
1416
shell: bash
17+
env:
18+
CODEQL_PATH: ${{steps.init.outputs.codeql-path}}
1519
run: |
16-
codeql/experimental/swift/tools/*/extractor --version | awk '/version/ { print $3 }'
20+
SWIFT_EXTRACTOR_DIR="$CODEQL_PATH" resolve languages --format json | jq -r '.swift[0]'
21+
$SWIFT_EXTRACTOR_DIR/tools/*/extractor --version | awk '/version/ { print $3 }'
1722
echo "version=$VERSION" | tee -a $GITHUB_OUTPUT
1823
- uses: swift-actions/setup-swift@194625b58a582570f61cc707c3b558086c26b723
19-
# We don't support Swift on Windows
2024
if: runner.os != 'Windows'
2125
with:
2226
swift-version: "${{steps.get_swift_version.outputs.version}}"

pr-checks/checks/multi-language-autodetect.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ steps:
1212
- name: Get Swift version
1313
id: get_swift_version
1414
shell: bash
15+
env:
16+
CODEQL_PATH: ${{steps.init.outputs.codeql-path}}
1517
run: |
16-
codeql/experimental/swift/tools/*/extractor --version | awk '/version/ { print $3 }'
18+
SWIFT_EXTRACTOR_DIR="$CODEQL_PATH" resolve languages --format json | jq -r '.swift[0]'
19+
$SWIFT_EXTRACTOR_DIR/tools/*/extractor --version | awk '/version/ { print $3 }'
1720
echo "version=$VERSION" | tee -a $GITHUB_OUTPUT
1821
1922
- uses: swift-actions/setup-swift@194625b58a582570f61cc707c3b558086c26b723

pr-checks/checks/swift-autobuild.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ steps:
1313
- name: Get Swift version
1414
id: get_swift_version
1515
shell: bash
16+
env:
17+
CODEQL_PATH: ${{steps.init.outputs.codeql-path}}
1618
run: |
17-
codeql/experimental/swift/tools/*/extractor --version | awk '/version/ { print $3 }'
19+
SWIFT_EXTRACTOR_DIR="$CODEQL_PATH" resolve languages --format json | jq -r '.swift[0]'
20+
$SWIFT_EXTRACTOR_DIR/tools/*/extractor --version | awk '/version/ { print $3 }'
1821
echo "version=$VERSION" | tee -a $GITHUB_OUTPUT
1922
- uses: swift-actions/setup-swift@194625b58a582570f61cc707c3b558086c26b723
2023
with:

pr-checks/checks/swift-custom-build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ steps:
1313
- name: Get Swift version
1414
id: get_swift_version
1515
shell: bash
16+
env:
17+
CODEQL_PATH: ${{steps.init.outputs.codeql-path}}
1618
run: |
17-
codeql/experimental/swift/tools/*/extractor --version | awk '/version/ { print $3 }'
19+
SWIFT_EXTRACTOR_DIR="$CODEQL_PATH" resolve languages --format json | jq -r '.swift[0]'
20+
$SWIFT_EXTRACTOR_DIR/tools/*/extractor --version | awk '/version/ { print $3 }'
1821
echo "version=$VERSION" | tee -a $GITHUB_OUTPUT
1922
- uses: swift-actions/setup-swift@194625b58a582570f61cc707c3b558086c26b723
2023
with:

0 commit comments

Comments
 (0)