This is an automated email from the ASF dual-hosted git repository.

raulcd pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-swift.git

commit 9a9424e279d5193a251af3345ef0a8b30c685a89
Author: abandy <[email protected]>
AuthorDate: Sat Jun 22 19:49:08 2024 -0400

    GH-42213: [Swift] Use "--warnings-as-errors" only on CI (#42214)
    
    ### Rationale for this change
    Downstream clients are getting a conflicting options error when building 
with the "-warnings-as-errors" swift option.
    
    ### What changes are included in this PR?
    This PR disables the "-warnings-as-errors" swift options by default and 
enables them for CI builds only.  The Swift CI script will enable the options 
in the Package.swift files before running the build.
    
    * GitHub Issue: #42213
    
    Lead-authored-by: Alva Bandy <[email protected]>
    Co-authored-by: Sutou Kouhei <[email protected]>
    Signed-off-by: Sutou Kouhei <[email protected]>
---
 Arrow/Package.swift       | 7 ++++---
 ArrowFlight/Package.swift | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Arrow/Package.swift b/Arrow/Package.swift
index 6944d7b..85407ea 100644
--- a/Arrow/Package.swift
+++ b/Arrow/Package.swift
@@ -46,8 +46,9 @@ let package = Package(
             name: "ArrowC",
             path: "Sources/ArrowC",
             swiftSettings: [
-                .unsafeFlags(["-warnings-as-errors"])
+                 // build: .unsafeFlags(["-warnings-as-errors"])
             ]
+
         ),
         .target(
             name: "Arrow",
@@ -56,14 +57,14 @@ let package = Package(
                 .product(name: "Atomics", package: "swift-atomics")
             ],
             swiftSettings: [
-                .unsafeFlags(["-warnings-as-errors"])
+                 // build: .unsafeFlags(["-warnings-as-errors"])
             ]
         ),
         .testTarget(
             name: "ArrowTests",
             dependencies: ["Arrow", "ArrowC"],
             swiftSettings: [
-                .unsafeFlags(["-warnings-as-errors"])
+                 // build: .unsafeFlags(["-warnings-as-errors"])
             ]
         )
     ]
diff --git a/ArrowFlight/Package.swift b/ArrowFlight/Package.swift
index f4d6485..8366ccc 100644
--- a/ArrowFlight/Package.swift
+++ b/ArrowFlight/Package.swift
@@ -47,14 +47,14 @@ let package = Package(
                 .product(name: "SwiftProtobuf", package: "swift-protobuf")
             ],
             swiftSettings: [
-                .unsafeFlags(["-warnings-as-errors"])
+                // build: .unsafeFlags(["-warnings-as-errors"])
             ]
         ),
         .testTarget(
             name: "ArrowFlightTests",
             dependencies: ["ArrowFlight"],
             swiftSettings: [
-                .unsafeFlags(["-warnings-as-errors"])
+                // build: .unsafeFlags(["-warnings-as-errors"])
             ]
         )
     ]

Reply via email to