Skip to content

Commit 78d4e78

Browse files
ehussehuss
committed
Try Xcode 15.2
1 parent 49475a6 commit 78d4e78

File tree

3 files changed

+19
-21
lines changed

3 files changed

+19
-21
lines changed

‎.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ jobs:
457457
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin"
458458
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
459459
MACOSX_DEPLOYMENT_TARGET: 10.12
460-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
460+
SELECT_XCODE: /Applications/Xcode_15.2.app
461461
NO_LLVM_ASSERTIONS: 1
462462
NO_DEBUG_ASSERTIONS: 1
463463
NO_OVERFLOW_CHECKS: 1
@@ -470,7 +470,7 @@ jobs:
470470
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
471471
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
472472
MACOSX_DEPLOYMENT_TARGET: 10.12
473-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
473+
SELECT_XCODE: /Applications/Xcode_15.2.app
474474
NO_LLVM_ASSERTIONS: 1
475475
NO_DEBUG_ASSERTIONS: 1
476476
NO_OVERFLOW_CHECKS: 1
@@ -482,7 +482,7 @@ jobs:
482482
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
483483
MACOSX_DEPLOYMENT_TARGET: 10.12
484484
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
485-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
485+
SELECT_XCODE: /Applications/Xcode_15.2.app
486486
NO_LLVM_ASSERTIONS: 1
487487
NO_DEBUG_ASSERTIONS: 1
488488
NO_OVERFLOW_CHECKS: 1
@@ -493,7 +493,7 @@ jobs:
493493
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin"
494494
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
495495
MACOSX_DEPLOYMENT_TARGET: 10.12
496-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
496+
SELECT_XCODE: /Applications/Xcode_15.2.app
497497
NO_LLVM_ASSERTIONS: 1
498498
NO_DEBUG_ASSERTIONS: 1
499499
NO_OVERFLOW_CHECKS: 1
@@ -506,7 +506,7 @@ jobs:
506506
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
507507
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
508508
MACOSX_DEPLOYMENT_TARGET: 10.12
509-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
509+
SELECT_XCODE: /Applications/Xcode_15.2.app
510510
NO_LLVM_ASSERTIONS: 1
511511
NO_DEBUG_ASSERTIONS: 1
512512
NO_OVERFLOW_CHECKS: 1
@@ -518,7 +518,7 @@ jobs:
518518
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
519519
MACOSX_DEPLOYMENT_TARGET: 10.12
520520
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
521-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
521+
SELECT_XCODE: /Applications/Xcode_15.2.app
522522
NO_LLVM_ASSERTIONS: 1
523523
NO_DEBUG_ASSERTIONS: 1
524524
NO_OVERFLOW_CHECKS: 1
@@ -529,7 +529,7 @@ jobs:
529529
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin"
530530
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
531531
MACOSX_DEPLOYMENT_TARGET: 10.12
532-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
532+
SELECT_XCODE: /Applications/Xcode_15.2.app
533533
NO_LLVM_ASSERTIONS: 1
534534
NO_DEBUG_ASSERTIONS: 1
535535
NO_OVERFLOW_CHECKS: 1
@@ -542,7 +542,7 @@ jobs:
542542
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
543543
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
544544
MACOSX_DEPLOYMENT_TARGET: 10.12
545-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
545+
SELECT_XCODE: /Applications/Xcode_15.2.app
546546
NO_LLVM_ASSERTIONS: 1
547547
NO_DEBUG_ASSERTIONS: 1
548548
NO_OVERFLOW_CHECKS: 1
@@ -554,7 +554,7 @@ jobs:
554554
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
555555
MACOSX_DEPLOYMENT_TARGET: 10.12
556556
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
557-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
557+
SELECT_XCODE: /Applications/Xcode_15.2.app
558558
NO_LLVM_ASSERTIONS: 1
559559
NO_DEBUG_ASSERTIONS: 1
560560
NO_OVERFLOW_CHECKS: 1

‎src/ci/github-actions/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ jobs:
739739
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin
740740
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
741741
MACOSX_DEPLOYMENT_TARGET: 10.12
742-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
742+
SELECT_XCODE: /Applications/Xcode_15.2.app
743743
NO_LLVM_ASSERTIONS: 1
744744
NO_DEBUG_ASSERTIONS: 1
745745
NO_OVERFLOW_CHECKS: 1
@@ -753,7 +753,7 @@ jobs:
753753
RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc
754754
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
755755
MACOSX_DEPLOYMENT_TARGET: 10.12
756-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
756+
SELECT_XCODE: /Applications/Xcode_15.2.app
757757
NO_LLVM_ASSERTIONS: 1
758758
NO_DEBUG_ASSERTIONS: 1
759759
NO_OVERFLOW_CHECKS: 1
@@ -766,7 +766,7 @@ jobs:
766766
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
767767
MACOSX_DEPLOYMENT_TARGET: 10.12
768768
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
769-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
769+
SELECT_XCODE: /Applications/Xcode_15.2.app
770770
NO_LLVM_ASSERTIONS: 1
771771
NO_DEBUG_ASSERTIONS: 1
772772
NO_OVERFLOW_CHECKS: 1
@@ -778,7 +778,7 @@ jobs:
778778
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin
779779
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
780780
MACOSX_DEPLOYMENT_TARGET: 10.12
781-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
781+
SELECT_XCODE: /Applications/Xcode_15.2.app
782782
NO_LLVM_ASSERTIONS: 1
783783
NO_DEBUG_ASSERTIONS: 1
784784
NO_OVERFLOW_CHECKS: 1
@@ -792,7 +792,7 @@ jobs:
792792
RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc
793793
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
794794
MACOSX_DEPLOYMENT_TARGET: 10.12
795-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
795+
SELECT_XCODE: /Applications/Xcode_15.2.app
796796
NO_LLVM_ASSERTIONS: 1
797797
NO_DEBUG_ASSERTIONS: 1
798798
NO_OVERFLOW_CHECKS: 1
@@ -805,7 +805,7 @@ jobs:
805805
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
806806
MACOSX_DEPLOYMENT_TARGET: 10.12
807807
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
808-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
808+
SELECT_XCODE: /Applications/Xcode_15.2.app
809809
NO_LLVM_ASSERTIONS: 1
810810
NO_DEBUG_ASSERTIONS: 1
811811
NO_OVERFLOW_CHECKS: 1
@@ -817,7 +817,7 @@ jobs:
817817
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin
818818
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
819819
MACOSX_DEPLOYMENT_TARGET: 10.12
820-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
820+
SELECT_XCODE: /Applications/Xcode_15.2.app
821821
NO_LLVM_ASSERTIONS: 1
822822
NO_DEBUG_ASSERTIONS: 1
823823
NO_OVERFLOW_CHECKS: 1
@@ -831,7 +831,7 @@ jobs:
831831
RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc
832832
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
833833
MACOSX_DEPLOYMENT_TARGET: 10.12
834-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
834+
SELECT_XCODE: /Applications/Xcode_15.2.app
835835
NO_LLVM_ASSERTIONS: 1
836836
NO_DEBUG_ASSERTIONS: 1
837837
NO_OVERFLOW_CHECKS: 1
@@ -844,7 +844,7 @@ jobs:
844844
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
845845
MACOSX_DEPLOYMENT_TARGET: 10.12
846846
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
847-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
847+
SELECT_XCODE: /Applications/Xcode_15.2.app
848848
NO_LLVM_ASSERTIONS: 1
849849
NO_DEBUG_ASSERTIONS: 1
850850
NO_OVERFLOW_CHECKS: 1

‎src/ci/scripts/select-xcode.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@ IFS=$'\n\t'
77
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
88

99
if isMacOS; then
10-
if [[ -s "${SELECT_XCODE-}" ]]; then
11-
sudo xcode-select -s "${SELECT_XCODE}"
12-
fi
10+
sudo xcode-select -s "${SELECT_XCODE}"
1311
fi

0 commit comments

Comments
 (0)