diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml index 2bc9602..5c74f26 100644 --- a/.github/workflows/test-install.yml +++ b/.github/workflows/test-install.yml @@ -11,6 +11,11 @@ jobs: fail-fast: false matrix: os: [macos-latest, windows-latest, ubuntu-latest] + include: + - expected-version: 5.9-dev + + - os: ubuntu-latest + expected-version: 5.10 name: Test Swift toolchain install on ${{ matrix.os }} runs-on: ${{ matrix.os }} @@ -24,8 +29,9 @@ jobs: branch: development tag: DEVELOPMENT-SNAPSHOT-2023-05-20-a - - name: Check Swift version - run: swift --version + - name: check swift version + run: swift --version && swift --version | grep -q 'version ${{ matrix.expected-version }} ' + shell: bash - name: get macOS smoke test prerequisites if: ${{ runner.os == 'macOS' }} diff --git a/action.yml b/action.yml index d255301..cd15d59 100644 --- a/action.yml +++ b/action.yml @@ -286,5 +286,5 @@ runs: installer -pkg swift-${{ inputs.tag }}-osx.pkg -target CurrentUserHomeDirectory rm -f swift-${{ inputs.tag }}-osx.pkg - echo "TOOLCHAINS=$(plutil -extract 'CFBundleIdentifier' xml1 ${HOME}/Library/Developer/Toolchains/swift-${{ inputs.tag }}.xctoolchain/Info.plist | xmllint --xpath '//plist/string/text()' -)" >> $GITHUB_ENV + echo "TOOLCHAINS=$(plutil -convert swift ${HOME}/Library/Developer/Toolchains/swift-${{ inputs.tag }}.xctoolchain/Info.plist -o - | sed -E -e '/"org.swift./s/.*"(org.swift[^"]*)".*/\1/')" >> $GITHUB_ENV shell: bash