Fix up CI to support arm and intel runners

realm · May 4, 2024 · f04eab2 · f04eab2
1 parent fd7f501
commit f04eab2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,9 +6,15 @@
 
 ##### Enhancements
 
+* Support Swift 5.10 with Swift Package Manager projects.  
+  [John Fairhurst](https://github.com/johnfairh)
+  [#1381](https://github.com/realm/jazzy/issues/1381)
+
 * Support documentation of multiple modules in a single website.  Use
   `--modules` or the config-file `modules` for more control.  See the
   README 'Documenting multiple modules' for more details.  
+  [Argjira Mala](https://github.com/argjiramala-tomtom)
+  [Pedro Alcobia](https://github.com/PedroAlcobia-TomTom)
   [John Fairhurst](https://github.com/johnfairh)
   [#564](https://github.com/realm/jazzy/issues/564)
 

diff --git a/spec/integration_spec.rb b/spec/integration_spec.rb
@@ -121,6 +121,8 @@ def configure_cocoapods
     s.replace_pattern(%r{/transformed/}, '/')
     # Xcode 15 workaround
     s.replace_pattern(/objc\[.....\]: Class _?DTX\w+ is implemented in both.*?\n/, '')
+    # arm vs. intel workaround
+    s.replace_pattern(%r{(?<=build/)(arm64|x86_64)(?=-apple)}, '')
   end
 
   require 'shellwords'

diff --git a/spec/integration_specs b/spec/integration_specs