Skip to content

Commit

Permalink
Stop passing Swift version since only 5 is supported
Browse files Browse the repository at this point in the history
  • Loading branch information
onevcat committed Apr 20, 2024
1 parent 5fb0263 commit bbca0cb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ jobs:
'tvOS Simulator,name=Apple TV',
'watchOS Simulator,name=Apple Watch Series 8 (41mm)'
]
swift-version: [5.0]
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
Expand All @@ -22,5 +21,4 @@ jobs:
- name: Run tests
env:
DESTINATION: platform=${{ matrix.destination }}
SWIFT_VERSION: ${{ matrix.swift-version }}
run: bundle exec fastlane test_ci
14 changes: 6 additions & 8 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,24 @@ default_platform :ios
platform :ios do
desc "Runs all the tests"
lane :tests do
test(destination: "platform=macOS", swift_version: "5.0")
test(destination: "platform=iOS Simulator,name=iPhone 14", swift_version: "5.0")
test(destination: "platform=tvOS Simulator,name=Apple TV", swift_version: "5.0")
build(destination: "platform=watchOS Simulator,name=Apple Watch Series 8 (41mm)", swift_version: "5.0")
test(destination: "platform=macOS")
test(destination: "platform=iOS Simulator,name=iPhone 14")
test(destination: "platform=tvOS Simulator,name=Apple TV")
build(destination: "platform=watchOS Simulator,name=Apple Watch Series 8 (41mm)")
end

lane :test_ci do
if ENV["DESTINATION"].include? "watchOS" then
build(destination: ENV["DESTINATION"], swift_version: ENV["SWIFT_VERSION"])
build(destination: ENV["DESTINATION"])
else
test(destination: ENV["DESTINATION"], swift_version: ENV["SWIFT_VERSION"])
test(destination: ENV["DESTINATION"])
end
end

lane :test do |options|
scan(
scheme: "Kingfisher",
clean: true,
xcargs: "SWIFT_VERSION=#{options[:swift_version]}",
destination: options[:destination]
)
end
Expand All @@ -34,7 +33,6 @@ platform :ios do
workspace: "Kingfisher.xcworkspace",
configuration: "Debug",
scheme: "Kingfisher",
xcargs: "SWIFT_VERSION=#{options[:swift_version]}",
destination: options[:destination]
)
end
Expand Down

0 comments on commit bbca0cb

Please sign in to comment.