From 5e52becd137421876bd3ebc70598308b2ea91a06 Mon Sep 17 00:00:00 2001 From: William Hyun Date: Mon, 12 May 2025 20:42:03 -0700 Subject: [PATCH 1/2] Add Swift 6 CI --- .github/workflows/build_and_test.yml | 10 ++++++++++ Sources/SparkConnect/DataStreamWriter.swift | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 9e90401..6588a74 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -39,6 +39,16 @@ jobs: with: config: .github/.licenserc.yaml + build-macos-15: + runs-on: macos-15 + steps: + - uses: actions/checkout@v4 + - uses: swift-actions/setup-swift@d10500c1ac8822132eebbd74c48c3372c71d7ff5 + with: + swift-version: "6.0" + - name: Build + run: swift build -c release + build-macos-15: runs-on: macos-15 steps: diff --git a/Sources/SparkConnect/DataStreamWriter.swift b/Sources/SparkConnect/DataStreamWriter.swift index 9822899..08fbd0e 100644 --- a/Sources/SparkConnect/DataStreamWriter.swift +++ b/Sources/SparkConnect/DataStreamWriter.swift @@ -190,7 +190,7 @@ public actor DataStreamWriter: Sendable { UUID(uuidString: result.queryID.id)!, UUID(uuidString: result.queryID.runID)!, result.name, - self.df.sparkSession, + self.df.sparkSession ) return query From b53844eccf3c05d095cfd34739f3e86ccd04ab9e Mon Sep 17 00:00:00 2001 From: William Hyun Date: Mon, 12 May 2025 20:45:26 -0700 Subject: [PATCH 2/2] Update the names to be unique --- .github/workflows/build_and_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 6588a74..1b0a9ea 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -39,7 +39,7 @@ jobs: with: config: .github/.licenserc.yaml - build-macos-15: + build-macos-15-swift60: runs-on: macos-15 steps: - uses: actions/checkout@v4 @@ -49,7 +49,7 @@ jobs: - name: Build run: swift build -c release - build-macos-15: + build-macos-15-swift61: runs-on: macos-15 steps: - uses: actions/checkout@v4