Skip to content

Commit 5c9d953

Browse files
authored
Merge branch 'main' into aeisenberg/upload-eslint-sarif
2 parents 55c72b9 + 8fd294e commit 5c9d953

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ runs:
1111
id: get_swift_version
1212
if: runner.os == 'Linux'
1313
shell: bash
14-
env:
14+
env:
1515
CODEQL_PATH: ${{ inputs.codeql-path }}
1616
run: |
1717
SWIFT_EXTRACTOR_DIR="$("$CODEQL_PATH" resolve languages --format json | jq -r '.swift[0]')"
1818
if [ $SWIFT_EXTRACTOR_DIR = "null" ]; then
1919
VERSION="null"
2020
else
2121
VERSION="$("$SWIFT_EXTRACTOR_DIR/tools/linux64/extractor" --version | awk '/version/ { print $3 }')"
22-
# Specify 5.x.0, otherwise setup Action will default to latest minor version.
22+
# Specify 5.x.0, otherwise setup Action will default to latest minor version.
2323
if [ $VERSION = "5.7" ]; then
2424
VERSION="5.7.0"
2525
elif [ $VERSION = "5.8" ]; then
@@ -29,11 +29,11 @@ runs:
2929
# setup-swift does not yet support v5.9.1 Remove this when it does.
3030
elif [ $VERSION = "5.9.1" ]; then
3131
VERSION="5.9.0"
32-
fi
32+
fi
3333
fi
3434
echo "version=$VERSION" | tee -a $GITHUB_OUTPUT
3535
36-
- uses: redsun82/setup-swift@b2b6f77ab14f6a9b136b520dc53ec8eca27d2b99 # Please update the corresponding SHA in the CLI's CodeQL Action Integration Test.
36+
- uses: redsun82/setup-swift@362f49f31da2f5f4f851657046bdd1290d03edc8 # Please update the corresponding SHA in the CLI's CodeQL Action Integration Test.
3737
if: runner.os == 'Linux' && steps.get_swift_version.outputs.version != 'null'
3838
with:
3939
swift-version: "${{ steps.get_swift_version.outputs.version }}"

0 commit comments

Comments
 (0)