Skip to content

Commit 71bd307

Browse files
authored
Merge pull request #530 from madsmtm/update
Update dependencies, Xcode version and minimum deployment target
2 parents 2ad20c3 + c025722 commit 71bd307

File tree

114 files changed

+1639
-4650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+1639
-4650
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ env:
2525
# Faster compilation, error on warnings and only document current crate
2626
RUSTFLAGS: "--codegen=debuginfo=0 --deny=warnings"
2727
RUSTDOCFLAGS: "--deny=warnings"
28-
# Minimum deployment target
29-
MACOSX_DEPLOYMENT_TARGET: 10.7
30-
IPHONEOS_DEPLOYMENT_TARGET: 7.0
28+
# Minimum deployment targets.
29+
# Follows `rustc --target=x86_64-apple-darwin --print deployment-target`
30+
MACOSX_DEPLOYMENT_TARGET: 10.12
31+
# Follows `rustc --target=x86_64-apple-ios --print deployment-target`
32+
IPHONEOS_DEPLOYMENT_TARGET: 10.0
3133
# We only support compiling Objective-C code with clang
3234
CC: clang
3335
CXX: clang++
@@ -44,14 +46,14 @@ env:
4446
--package=objc2-encode
4547
--package=objc2-proc-macros
4648
# The current nightly Rust version that our CI uses
47-
CURRENT_NIGHTLY: nightly-2023-08-27
49+
CURRENT_NIGHTLY: nightly-2023-11-22
4850
# Various features that we'd usually want to test with
4951
#
5052
# Note: The `exception` feature is not enabled here, since it requires
5153
# compiling C code, even if just running a `check`/`clippy` build.
5254
INTERESTING_FEATURES: malloc,block,verify,unstable-private
5355
UNSTABLE_FEATURES: unstable-autoreleasesafe,unstable-c-unwind
54-
LATEST_MACOS_FEATURE: unstable-frameworks-macos-13
56+
LATEST_MACOS_FEATURE: unstable-frameworks-macos-14
5557
# Required when we want to use a different runtime than the default `apple`
5658
OTHER_RUNTIME: --no-default-features --features=std
5759
# https://doc.rust-lang.org/cargo/guide/cargo-home.html#caching-the-cargo-home-in-ci
@@ -102,7 +104,7 @@ jobs:
102104
--features=$INTERESTING_FEATURES
103105
--features=unstable-frameworks-macos-12
104106
- name: iOS 32bit
105-
target: armv7-apple-ios
107+
target: armv7s-apple-ios
106108
build-std: true
107109
args: >-
108110
-Zbuild-std
@@ -257,7 +259,7 @@ jobs:
257259
- lint
258260

259261
env:
260-
DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
262+
DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer
261263

262264
steps:
263265
- uses: actions/checkout@v3
@@ -354,6 +356,9 @@ jobs:
354356
fail-fast: true
355357
matrix:
356358
include:
359+
- name: Test macOS 13
360+
os: macos-13
361+
frameworks: macos-13
357362
- name: Test macOS 11
358363
os: macos-11
359364
frameworks: macos-11
@@ -362,8 +367,8 @@ jobs:
362367
frameworks: macos-11
363368
- name: Test macOS old SDK
364369
# Oldest macOS version we support
365-
sdk: "10.7"
366-
frameworks: macos-10-7
370+
sdk: "10.12"
371+
frameworks: macos-10-12
367372
- name: Test macOS nightly
368373
nightly: true
369374
frameworks: macos-11
@@ -380,11 +385,6 @@ jobs:
380385
- name: Build iOS ARM64
381386
target: aarch64-apple-ios
382387
frameworks: ios
383-
- name: Build iOS ARMv7
384-
target: armv7-apple-ios
385-
nightly: true
386-
build-std: true
387-
frameworks: ios
388388
- name: Build iOS ARMv7s
389389
target: armv7s-apple-ios
390390
nightly: true
@@ -478,7 +478,7 @@ jobs:
478478
# TODO: Re-enable this on all of Foundation once we do some form of
479479
# availability checking.
480480
- name: Test static class and selectors
481-
if: ${{ !contains(matrix.frameworks, 'ios') && !contains(matrix.frameworks, 'macos-10-7') }}
481+
if: ${{ !contains(matrix.frameworks, 'ios') && !contains(matrix.frameworks, 'macos-10-12') }}
482482
run: >-
483483
cargo test $ARGS $PUBLIC_CRATES -ptests
484484
--features=unstable-static-sel,unstable-static-class,unstable-static-nsstring
@@ -545,6 +545,8 @@ jobs:
545545
- lint
546546

547547
strategy:
548+
# GNUStep tests are currently flaky, this makes it easier to see
549+
fail-fast: false
548550
matrix:
549551
include:
550552
- name: Test GNUStep with libobjc2 v1.9

0 commit comments

Comments
 (0)