From 52e27e1ffbe6111ebf356abfd099d51a6606d8e8 Mon Sep 17 00:00:00 2001 From: John Fairhurst Date: Tue, 17 May 2022 11:03:50 +0100 Subject: [PATCH 1/2] Update CI to macOS 12 --- .github/workflows/Tests.yml | 4 ++-- CONTRIBUTING.md | 2 +- spec/integration_specs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml index d1754fe07..ca846231a 100644 --- a/.github/workflows/Tests.yml +++ b/.github/workflows/Tests.yml @@ -25,13 +25,13 @@ jobs: bundle exec danger --verbose spec: - runs-on: macos-11 + runs-on: macos-12 continue-on-error: true strategy: matrix: spec: ["objc_spec", "swift_spec", "cocoapods_spec"] env: - DEVELOPER_DIR: /Applications/Xcode_13.2.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_13.3.app/Contents/Developer steps: - uses: actions/checkout@v2 with: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7cd7363a9..a9ce5a126 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -49,7 +49,7 @@ git push You'll need push access to the integration specs repo to do this. You can request access from one of the maintainers when filing your PR. -You must have Xcode 13.2 installed to build the integration specs. +You must have Xcode 13.3 installed to build the integration specs. ## Making changes to SourceKitten diff --git a/spec/integration_specs b/spec/integration_specs index d5f248e50..e26e46f3e 160000 --- a/spec/integration_specs +++ b/spec/integration_specs @@ -1 +1 @@ -Subproject commit d5f248e504bd349687ae6f609d06d420ad259ba6 +Subproject commit e26e46f3e73b23606b6a28f62f65ef4ae3705d10 From ee3f748400c1cf1655fe1297cb14527353f2cba3 Mon Sep 17 00:00:00 2001 From: John Fairhurst Date: Tue, 17 May 2022 13:00:49 +0100 Subject: [PATCH 2/2] Filter out odd Xcode warnings --- spec/integration_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/integration_spec.rb b/spec/integration_spec.rb index 04b120ead..5b75a5465 100644 --- a/spec/integration_spec.rb +++ b/spec/integration_spec.rb @@ -108,8 +108,10 @@ def configure_cocoapods s.replace_path ROOT.to_s, 'ROOT' s.replace_pattern /^[\d\s:.-]+ ruby\[\d+:\d+\] warning:.*$\n?/, '' # Remove version numbers from CocoaPods dependencies - # to make specs resilient against dependecy updates. + # to make specs resilient against dependency updates. s.replace_pattern(/(Installing \w+ )\((.*)\)/, '\1(X.Y.Z)') + # Xcode 13.3 workaround + s.replace_pattern(/202.*?IDEWatchSupportCore\n/, '') end require 'shellwords'