robojerk/codeql-action

Update setup-swift version

Browse source 
Allows running swift v5.10.1.
This commit is contained in:
Andrew Eisenberg 2024-09-09 14:06:08 -07:00
parent d8b1697e9a
commit c00e2392d2
No known key found for this signature in database
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/actions/setup-swift/action.yml vendored
View file

@ -11,7 +11,7 @@ runs:
id: get_swift_version id: get_swift_version
if: runner.os == 'Linux' if: runner.os == 'Linux'
shell: bash shell: bash
env: env:
CODEQL_PATH: ${{ inputs.codeql-path }} CODEQL_PATH: ${{ inputs.codeql-path }}
run: | run: |
SWIFT_EXTRACTOR_DIR="$("$CODEQL_PATH" resolve languages --format json | jq -r '.swift[0]')" SWIFT_EXTRACTOR_DIR="$("$CODEQL_PATH" resolve languages --format json | jq -r '.swift[0]')"
@ -19,7 +19,7 @@ runs:
VERSION="null" VERSION="null"
else else
VERSION="$("$SWIFT_EXTRACTOR_DIR/tools/linux64/extractor" --version | awk '/version/ { print $3 }')" VERSION="$("$SWIFT_EXTRACTOR_DIR/tools/linux64/extractor" --version | awk '/version/ { print $3 }')"
# Specify 5.x.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 if [ $VERSION = "5.7" ]; then
VERSION="5.7.0" VERSION="5.7.0"
elif [ $VERSION = "5.8" ]; then elif [ $VERSION = "5.8" ]; then
@ -29,11 +29,11 @@ runs:
# setup-swift does not yet support v5.9.1 Remove this when it does. # setup-swift does not yet support v5.9.1 Remove this when it does.
elif [ $VERSION = "5.9.1" ]; then elif [ $VERSION = "5.9.1" ]; then
VERSION="5.9.0" VERSION="5.9.0"
fi fi
fi fi
echo "version=$VERSION" | tee -a $GITHUB_OUTPUT echo "version=$VERSION" | tee -a $GITHUB_OUTPUT
- uses: redsun82/setup-swift@b2b6f77ab14f6a9b136b520dc53ec8eca27d2b99 # Please update the corresponding SHA in the CLI's CodeQL Action Integration Test. - uses: redsun82/setup-swift@362f49f31da2f5f4f851657046bdd1290d03edc8 # Please update the corresponding SHA in the CLI's CodeQL Action Integration Test.
if: runner.os == 'Linux' && steps.get_swift_version.outputs.version != 'null' if: runner.os == 'Linux' && steps.get_swift_version.outputs.version != 'null'
with: with:
swift-version: "${{ steps.get_swift_version.outputs.version }}" swift-version: "${{ steps.get_swift_version.outputs.version }}"