Skip to content

Commit 3d87608

Browse files
author
Guilherme Souza
authored
fix: remove usage of nonisolated(unsafe) from codebase (supabase#638)
* ci: add job for xcode 15.2 * remove unsafe * wip * remove nonisolated(unsafe) * remove testable * use test and remove testplans * add all targets to Supabase scheme * move scheme files back * skip release * wip * run ci for all platforms * remove duplicate build-for-library-evolution from makefile * run ci on xcode 16.2 * wip
1 parent 4ff5f23 commit 3d87608

30 files changed

+482
-486
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 42 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,31 @@ concurrency:
1414
cancel-in-progress: true
1515

1616
jobs:
17-
xcodebuild:
17+
xcodebuild-latest:
18+
name: xcodebuild (16)
1819
runs-on: macos-15
1920
strategy:
2021
matrix:
2122
command: [test, ""]
22-
platform: [IOS, MAC_CATALYST, MACOS, TVOS, VISIONOS, WATCHOS]
23-
exclude:
24-
- { platform: VISIONOS }
23+
platform: [IOS, MACOS]
24+
xcode: ["16.2"]
2525
include:
26-
- { command: test, skip_release: 1 }
26+
- {command: test, skip_release: 1}
2727
steps:
2828
- uses: actions/checkout@v4
29+
- name: Select Xcode ${{ matrix.xcode }}
30+
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
31+
- name: List available devices
32+
run: xcrun simctl list devices available
2933
- name: Cache derived data
3034
uses: actions/cache@v3
3135
with:
3236
path: |
3337
~/.derivedData
3438
key: |
35-
deriveddata-xcodebuild-${{ matrix.platform }}-${{ matrix.command }}-${{ hashFiles('**/Sources/**/*.swift', '**/Tests/**/*.swift') }}
39+
deriveddata-xcodebuild-${{ matrix.platform }}-${{ matrix.xcode }}-${{ matrix.command }}-${{ hashFiles('**/Sources/**/*.swift', '**/Tests/**/*.swift') }}
3640
restore-keys: |
37-
deriveddata-xcodebuild-${{ matrix.platform }}-${{ matrix.command }}-
41+
deriveddata-xcodebuild-${{ matrix.platform }}-${{ matrix.xcode }}-${{ matrix.command }}-
3842
- name: Set IgnoreFileSystemDeviceInodeChanges flag
3943
run: defaults write com.apple.dt.XCBuild IgnoreFileSystemDeviceInodeChanges -bool YES
4044
- name: Update mtime for incremental builds
@@ -46,27 +50,44 @@ jobs:
4650
if: matrix.skip_release != '1'
4751
run: make XCODEBUILD_ARGUMENT="${{ matrix.command }}" CONFIG=Release PLATFORM="${{ matrix.platform }}" xcodebuild
4852

49-
xcodebuild-macOS-14:
53+
xcodebuild:
54+
name: xcodebuild (15)
5055
runs-on: macos-14
5156
strategy:
5257
matrix:
5358
command: [test, ""]
5459
platform: [IOS, MAC_CATALYST, MACOS, TVOS, VISIONOS, WATCHOS]
60+
xcode: [15.2, 15.4]
5561
exclude:
56-
- { platform: VISIONOS }
62+
- {xcode: 15.2, command: test}
63+
- {xcode: 15.2, platform: MAC_CATALYST}
64+
- {xcode: 15.2, platform: TVOS}
65+
- {xcode: 15.2, platform: VISIONOS}
66+
- {xcode: 15.2, platform: WATCHOS}
5767
include:
58-
- { command: test, skip_release: 1 }
68+
- {command: test, skip_release: 1}
5969
steps:
6070
- uses: actions/checkout@v4
71+
- name: Select Xcode ${{ matrix.xcode }}
72+
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
73+
- name: Install visionOS runtime
74+
if: matrix.platform == 'visionOS'
75+
run: |
76+
sudo xcodebuild -runFirstLaunch
77+
sudo xcrun simctl list
78+
sudo xcodebuild -downloadPlatform visionOS
79+
sudo xcodebuild -runFirstLaunch
80+
- name: List available devices
81+
run: xcrun simctl list devices available
6182
- name: Cache derived data
6283
uses: actions/cache@v3
6384
with:
6485
path: |
6586
~/.derivedData
6687
key: |
67-
deriveddata-xcodebuild-${{ matrix.platform }}-${{ matrix.command }}-${{ hashFiles('**/Sources/**/*.swift', '**/Tests/**/*.swift') }}
88+
deriveddata-xcodebuild-${{ matrix.platform }}-${{ matrix.xcode }}-${{ matrix.command }}-${{ hashFiles('**/Sources/**/*.swift', '**/Tests/**/*.swift') }}
6889
restore-keys: |
69-
deriveddata-xcodebuild-${{ matrix.platform }}-${{ matrix.command }}-
90+
deriveddata-xcodebuild-${{ matrix.platform }}-${{ matrix.xcode }}-${{ matrix.command }}-
7091
- name: Set IgnoreFileSystemDeviceInodeChanges flag
7192
run: defaults write com.apple.dt.XCBuild IgnoreFileSystemDeviceInodeChanges -bool YES
7293
- name: Update mtime for incremental builds
@@ -102,15 +123,15 @@ jobs:
102123
# - name: Run tests
103124
# run: swift test --skip IntegrationTests
104125

105-
# library-evolution:
106-
# name: Library (evolution)
107-
# runs-on: macos-14
108-
# steps:
109-
# - uses: actions/checkout@v4
110-
# - name: Select Xcode 15.4
111-
# run: sudo xcode-select -s /Applications/Xcode_15.4.app
112-
# - name: Build for library evolution
113-
# run: make build-for-library-evolution
126+
library-evolution:
127+
name: Library (evolution)
128+
runs-on: macos-14
129+
steps:
130+
- uses: actions/checkout@v4
131+
- name: Select Xcode 15.4
132+
run: sudo xcode-select -s /Applications/Xcode_15.4.app
133+
- name: Build for library evolution
134+
run: make build-for-library-evolution
114135

115136
examples:
116137
name: Examples

‎.swiftpm/configuration/Package.resolved‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.swiftpm/xcode/xcshareddata/xcschemes/Auth.xcscheme‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,8 @@
2828
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2929
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
3030
shouldUseLaunchSchemeArgsEnv = "YES">
31-
<TestPlans>
32-
<TestPlanReference
33-
reference = "container:TestPlans/Auth.xctestplan"
34-
default = "YES">
35-
</TestPlanReference>
36-
</TestPlans>
31+
<Testables>
32+
</Testables>
3733
</TestAction>
3834
<LaunchAction
3935
buildConfiguration = "Debug"

‎.swiftpm/xcode/xcshareddata/xcschemes/Functions.xcscheme‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,8 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<TestPlans>
31-
<TestPlanReference
32-
reference = "container:TestPlans/Functions.xctestplan"
33-
default = "YES">
34-
</TestPlanReference>
35-
</TestPlans>
30+
<Testables>
31+
</Testables>
3632
</TestAction>
3733
<LaunchAction
3834
buildConfiguration = "Debug"

‎.swiftpm/xcode/xcshareddata/xcschemes/PostgREST.xcscheme‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,8 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<TestPlans>
31-
<TestPlanReference
32-
reference = "container:TestPlans/PostgREST.xctestplan"
33-
default = "YES">
34-
</TestPlanReference>
35-
</TestPlans>
30+
<Testables>
31+
</Testables>
3632
</TestAction>
3733
<LaunchAction
3834
buildConfiguration = "Debug"

‎.swiftpm/xcode/xcshareddata/xcschemes/Realtime.xcscheme‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,8 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<TestPlans>
31-
<TestPlanReference
32-
reference = "container:TestPlans/Realtime.xctestplan"
33-
default = "YES">
34-
</TestPlanReference>
35-
</TestPlans>
30+
<Testables>
31+
</Testables>
3632
</TestAction>
3733
<LaunchAction
3834
buildConfiguration = "Debug"

‎.swiftpm/xcode/xcshareddata/xcschemes/Storage.xcscheme‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,8 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<TestPlans>
31-
<TestPlanReference
32-
reference = "container:TestPlans/Storage.xctestplan"
33-
default = "YES">
34-
</TestPlanReference>
35-
</TestPlans>
30+
<Testables>
31+
</Testables>
3632
</TestAction>
3733
<LaunchAction
3834
buildConfiguration = "Debug"

0 commit comments

Comments
 (0)