Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit be91b5c

Browse files
committedSep 6, 2024··
Try and resolve CI arm vs. intel
1 parent 0955196 commit be91b5c

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed
 

‎.github/workflows/Tests.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
- uses: actions/checkout@v4
3535
with:
3636
submodules: recursive
37+
persist-credentials: false
3738
- uses: maxim-lobanov/setup-xcode@v1
3839
with:
3940
xcode-version: '16.0-beta'
@@ -42,7 +43,7 @@ jobs:
4243
ruby-version: 3.2
4344
bundler-cache: true
4445
- name: Cache cocoapods
45-
uses: actions/cache@v3
46+
uses: actions/cache@v4
4647
env:
4748
cache-name: cocoapods
4849
with:

‎spec/integration_spec.rb

+17-4
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,15 @@ def configure_cocoapods
146146
</script>
147147
HTML
148148

149+
realm_jazzy_yaml = <<-YAML
150+
build_tool_arguments:
151+
- "-scheme"
152+
- "RealmSwift"
153+
- "SWIFT_VERSION=4.2"
154+
- "-destination"
155+
- "platform=OS X,arch=x86_64"
156+
YAML
157+
149158
spec_subset = ENV.fetch('JAZZY_SPEC_SUBSET', nil)
150159

151160
# rubocop:disable Style/MultilineIfModifier
@@ -208,9 +217,15 @@ def configure_cocoapods
208217

209218
describe 'Creates Realm Swift docs' do
210219
realm_version = ''
211-
Dir.chdir(ROOT + 'spec/integration_specs/document_realm_swift/before') do
220+
realm_path = ROOT + 'spec/integration_specs/document_realm_swift/before'
221+
realm_jazzy_path = realm_path + '.jazzy.yaml'
222+
223+
Dir.chdir(realm_path) do
212224
realm_version = `./build.sh get-version`.chomp
213225
end
226+
# Xcode 16 workaround
227+
File.write(realm_jazzy_path, realm_jazzy_yaml)
228+
214229
behaves_like cli_spec 'document_realm_swift',
215230
'--author Realm ' \
216231
'--author_url "https://realm.io" ' \
@@ -222,10 +237,8 @@ def configure_cocoapods
222237
"--module-version #{realm_version} " \
223238
'--root-url https://realm.io/docs/swift/' \
224239
"#{realm_version}/api/ " \
225-
'--xcodebuild-arguments ' \
226-
'-scheme,RealmSwift,SWIFT_VERSION=4.2,' \
227-
"-destination,'platform=OS X' " \
228240
"--head #{realm_head.shellescape}"
241+
FileUtils.rm_rf realm_jazzy_path
229242
end
230243

231244
describe 'Creates Siesta docs' do

0 commit comments

Comments
 (0)
Please sign in to comment.