Skip to content

Commit 08c637a

Browse files
authored
Merge pull request #39 from phuzion/main
Fix up Package.swift and GitHub Actions
2 parents 51ee397 + 4b27040 commit 08c637a

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

.github/workflows/RunTests.yaml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,9 @@ jobs:
1515
runs-on: macos-latest
1616

1717
steps:
18-
- uses: actions/checkout@v3
19-
# https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#example-of-writing-an-environment-variable-to-github_env
20-
# get Package.swift file contents, find line with swift-tools-version, get string after :, trim whitespaces from string
21-
- name: Get swift version from Package.swift file
22-
shell: bash
23-
run: |
24-
echo "swift-tools-version=$( cat ./Package.swift | grep swift-tools-version | cut -d ":" -f2 | sed -e 's/^[[:space:]]*//' )" >> $GITHUB_ENV
25-
- uses: swift-actions/setup-swift@v1
26-
with:
27-
swift-version: "${{ env.swift-tools-version }}"
18+
- uses: actions/checkout@v6
19+
- name: Select Xcode
20+
run: sudo xcode-select -s /Applications/Xcode.app
2821
- name: Verify swift version
2922
run: swift --version
3023
- name: Build

Package.swift

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,24 @@ let package = Package(
88
.macOS(.v12),
99
.iOS(.v15),
1010
.watchOS(.v8),
11-
.tvOS(.v15),
11+
.tvOS(.v15)
1212
],
1313
products: [
1414
.library(
1515
name: "Blackbird",
16-
targets: ["Blackbird"]),
17-
],
18-
dependencies: [
16+
targets: ["Blackbird"]
17+
)
1918
],
19+
dependencies: [],
2020
targets: [
2121
.target(
2222
name: "Blackbird",
23-
dependencies: [],
23+
dependencies: []
2424
),
2525
.testTarget(
2626
name: "BlackbirdTests",
27-
dependencies: ["Blackbird"]),
27+
dependencies: ["Blackbird"]
28+
)
2829
],
2930
swiftLanguageModes: [.v6]
3031
)

0 commit comments

Comments
 (0)