Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 3 additions & 9 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@
# under the License.

included:
- Arrow/Package.swift
- Arrow/Sources
- Arrow/Tests
- ArrowFlight/Package.swift
- ArrowFlight/Sources
- ArrowFlight/Tests
- CDataWGo/Package.swift
- CDataWGo/Sources/go-swift
excluded:
Expand All @@ -30,9 +24,9 @@ excluded:
- Sources/Arrow/Schema_generated.swift
- Sources/Arrow/SparseTensor_generated.swift
- Sources/Arrow/Tensor_generated.swift
- ArrowFlight/Sources/ArrowFlight/Flight.grpc.swift
- ArrowFlight/Sources/ArrowFlight/Flight.pb.swift
- ArrowFlight/Sources/ArrowFlight/FlightSql.pb.swift
- Sources/ArrowFlight/Flight.grpc.swift
- Sources/ArrowFlight/Flight.pb.swift
- Sources/ArrowFlight/FlightSql.pb.swift
identifier_name:
min_length: 2 # only warning
allow_zero_lintable_files: false
195 changes: 0 additions & 195 deletions ArrowFlight/Package.resolved

This file was deleted.

61 changes: 0 additions & 61 deletions ArrowFlight/Package.swift

This file was deleted.

2 changes: 0 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ let package = Package(
.product(name: "GRPC", package: "grpc-swift"),
.product(name: "SwiftProtobuf", package: "swift-protobuf")
],
path: "ArrowFlight/Sources/ArrowFlight",
swiftSettings: [
// build: .unsafeFlags(["-warnings-as-errors"])
]
Expand All @@ -75,7 +74,6 @@ let package = Package(
.testTarget(
name: "ArrowFlightTests",
dependencies: ["ArrowFlight"],
path: "ArrowFlight/Tests",
swiftSettings: [
// build: .unsafeFlags(["-warnings-as-errors"])
]
Expand Down
10 changes: 4 additions & 6 deletions ci/scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,10 @@ popd
github_actions_group_end

github_actions_group_begin "Use -warnings-as-errors"
for package in . ArrowFlight; do
pushd "${build_dir}/source/${package}"
sed 's/\/\/ build://g' Package.swift > Package.swift.build
mv Package.swift.build Package.swift
popd
done
pushd "${build_dir}/source/"
sed 's/\/\/ build://g' Package.swift > Package.swift.build
mv Package.swift.build Package.swift
popd
github_actions_group_end

github_actions_group_begin "Build"
Expand Down