Skip to content

Commit

Permalink
Try and resolve CI arm vs. intel
Browse files Browse the repository at this point in the history
  • Loading branch information
johnfairh committed Sep 6, 2024
1 parent 0955196 commit 06310d4
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/Tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: recursive
persist-credentials: false
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '16.0-beta'
Expand All @@ -42,7 +43,7 @@ jobs:
ruby-version: 3.2
bundler-cache: true
- name: Cache cocoapods
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cocoapods
with:
Expand Down
21 changes: 17 additions & 4 deletions spec/integration_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,15 @@ def configure_cocoapods
</script>
HTML

realm_jazzy_yaml= <<-YAML
build_tool_arguments:
- "-scheme"
- "RealmSwift"
- "SWIFT_VERSION=4.2"
- "-destination"
- "platform=OS X,arch=x86_64"
YAML

spec_subset = ENV.fetch('JAZZY_SPEC_SUBSET', nil)

# rubocop:disable Style/MultilineIfModifier
Expand Down Expand Up @@ -208,9 +217,15 @@ def configure_cocoapods

describe 'Creates Realm Swift docs' do
realm_version = ''
Dir.chdir(ROOT + 'spec/integration_specs/document_realm_swift/before') do
realm_path = ROOT + 'spec/integration_specs/document_realm_swift/before'
realm_jazzy_path = realm_path + '.jazzy.yaml'

Dir.chdir(realm_path) do
realm_version = `./build.sh get-version`.chomp
end
# Xcode 16 workaround
File.write(realm_jazzy_path, realm_jazzy_yaml)

behaves_like cli_spec 'document_realm_swift',
'--author Realm ' \
'--author_url "https://realm.io" ' \
Expand All @@ -222,10 +237,8 @@ def configure_cocoapods
"--module-version #{realm_version} " \
'--root-url https://realm.io/docs/swift/' \
"#{realm_version}/api/ " \
'--xcodebuild-arguments ' \
'-scheme,RealmSwift,SWIFT_VERSION=4.2,' \
"-destination,'platform=OS X' " \
"--head #{realm_head.shellescape}"
FileUtils.rm_rf realm_jazzy_path
end

describe 'Creates Siesta docs' do
Expand Down
2 changes: 1 addition & 1 deletion spec/integration_specs

0 comments on commit 06310d4

Please sign in to comment.