Skip to content

Fix macOS #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dabrahams wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Fix macOS #30

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c7897c3
Fix macOS; fail unless we really got it installed.
Mar 21, 2024
fbf1f99
Maybe don't suppress the output of grep.
Mar 21, 2024
464a9c4
Repair typo
Mar 21, 2024
8238888
Typo again.
Mar 21, 2024
5284872
Shot in the dark: use cut instead of sed.
Mar 21, 2024
aa6efbb
Add some diagnostic output
Mar 21, 2024
31abcdc
More diagnostics; try to make it work regardless of .plist format.
Mar 21, 2024
0f43d3e
Try a more resilient sed invocation.
Mar 21, 2024
9a5a537
Nix diagnostic echoes
Mar 21, 2024
13fcffd
GHA: repair the Ubuntu environment
Mar 21, 2024
0776936
Adjust version check for ubuntu build reporting itself as 5.10
Mar 21, 2024
3395352
take suggestion.
Mar 25, 2024
5990f2e
Merge branch 'main' into fix-macos
Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/test-install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-latest, windows-latest] # ubuntu-latest is not working at the moment
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 }}
Expand All @@ -23,4 +28,5 @@ jobs:
tag: DEVELOPMENT-SNAPSHOT-2023-05-20-a

- name: check swift version
run: swift --version
run: swift --version && swift --version | grep -q 'version ${{ matrix.expected-version }} '
shell: bash
4 changes: 2 additions & 2 deletions action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ runs:
if [[ "${{ steps.validation.outputs.use_custom_url }}" == "1" ]]; then
mv "${{ inputs.release-asset-name }}" swift-toolchain.tar.gz
else
curl -sL https://download.swift.org/${{ inputs.branch }}/ubuntu${release/./}/swift-${{ inputs.tag }}/swift-${{ inputs.tag }}-ubuntu${release}.tar.gz -o swift-toolchain.tar.gz
curl -sL https://download.swift.org/${{ inputs.branch }}/ubuntu${VERSION_ID/./}/swift-${{ inputs.tag }}/swift-${{ inputs.tag }}-ubuntu${VERSION_ID}.tar.gz -o swift-toolchain.tar.gz
fi
tar zxf swift-toolchain.tar.gz -C ${HOME}
rm -f swift-toolchain.tar.gz
Expand Down Expand Up @@ -285,5 +285,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 - | grep '"org.swift.' | sed -E -e 's/.*"(org.swift[^"]*)".*/\1/')" >> $GITHUB_ENV
Comment thread
dabrahams marked this conversation as resolved.
Outdated
shell: bash