Skip to content

Commit

Permalink
Add Swift 5.4 support
Browse files Browse the repository at this point in the history
  • Loading branch information
ffried committed Apr 27, 2021
1 parent 7416044 commit 4f72fef
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 23 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ jobs:
publish-docs:
runs-on: macos-latest
steps:
- run: sudo xcode-select -s /Applications/Xcode_12.3.app/Contents/Developer
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: ^12.4
- uses: dawidd6/action-get-tag@v1
id: get-tag
- uses: actions/checkout@v2
Expand Down
30 changes: 9 additions & 21 deletions .github/workflows/swift-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,18 @@ on:
branches: [ main ]

jobs:
validate-linux-tests:
runs-on: macos-latest
steps:
- run: sudo xcode-select -s /Applications/Xcode_12.3.app/Contents/Developer
- uses: actions/checkout@v2
- uses: actions/[email protected]
with:
path: .build
key: ${{runner.os}}-${{github.repository}}-spm-${{hashFiles('**/Package.resolved')}}
restore-keys: |
${{runner.os}}-${{github.repository}}-spm-
- name: Generate Linux Tests
run: swift test --generate-linuxmain
- name: Check for git differences
run: git diff --exit-code

test-spm:
strategy:
matrix:
os: [macos-latest, ubuntu-20.04]
os: [ macos-latest, ubuntu-20.04 ]

runs-on: ${{matrix.os}}

steps:
- run: sudo xcode-select -s /Applications/Xcode_12.3.app/Contents/Developer
if: runner.os == 'macOS'
- if: runner.os == 'macOS'
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: ^12.4
- name: Install Swift
if: runner.os == 'Linux'
uses: sersoft-gmbh/SwiftyActions@v1
Expand Down Expand Up @@ -64,7 +50,7 @@ jobs:
runs-on: macos-latest
strategy:
matrix:
action: [test]
action: [ test ]
destination:
- platform=macOS
- platform=iOS Simulator,OS=latest,name=iPhone 11 Pro
Expand All @@ -79,7 +65,9 @@ jobs:
# parallel-testing-enabled: false
# enable-code-coverage: false
steps:
- run: sudo xcode-select -s /Applications/Xcode_12.3.app/Contents/Developer
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: ^12.4
- uses: actions/checkout@v2
- uses: sersoft-gmbh/xcodebuild-action@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.3
// swift-tools-version:5.4
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
Expand Down
22 changes: 22 additions & 0 deletions [email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// swift-tools-version:5.3
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

let package = Package(
name: "app-information",
products: [
// Products define the executables and libraries a package produces, and make them visible to other packages.
.library(
name: "AppInformation",
targets: ["AppInformation"]),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
// Targets can depend on other targets in this package, and on products in packages this package depends on.
.target(name: "AppInformation"),
.testTarget(
name: "AppInformationTests",
dependencies: ["AppInformation"]),
]
)

0 comments on commit 4f72fef

Please sign in to comment.