Skip to content

Commit 2bbc979

Browse files
authored
Support for Xcode 12.5 (#497)
* Switch CI to macOS 11 Signed-off-by: Oscar Bonilla <6f6231@gmail.com>
1 parent 0e81960 commit 2bbc979

File tree

392 files changed

+8115
-2724
lines changed

Some content is hidden

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

392 files changed

+8115
-2724
lines changed

.github/workflows/PR.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ jobs:
66
# First machine, runs BP tests batch 1
77
integration_tests1:
88
name: Instance Test 1
9-
runs-on: macos-latest
9+
runs-on: macos-11
1010
steps:
1111
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
1212
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
13-
- name: Select Xcode 12.4
14-
run: sudo xcode-select -s /Applications/Xcode_12.4.app
13+
- name: Select Xcode 12.5
14+
run: sudo xcode-select -s /Applications/Xcode_12.5.app
1515
- name: Run Bluepill tests
1616
run: ./scripts/bluepill.sh instance_tests1
1717
- name: Capture xcresult files
@@ -25,12 +25,12 @@ jobs:
2525
# Second machine, runs BP tests batch 2
2626
integration_tests2:
2727
name: Instance Test 2
28-
runs-on: macos-latest
28+
runs-on: macos-11
2929
steps:
3030
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
3131
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
32-
- name: Select Xcode 12.4
33-
run: sudo xcode-select -s /Applications/Xcode_12.4.app
32+
- name: Select Xcode 12.5
33+
run: sudo xcode-select -s /Applications/Xcode_12.5.app
3434
- name: Run Bluepill tests
3535
run: ./scripts/bluepill.sh instance_tests2
3636
- name: Capture xcresult files
@@ -44,12 +44,12 @@ jobs:
4444
# Third machine, runs Bluepill tests and makes release build
4545
build:
4646
name: Bluepill Test and build
47-
runs-on: macos-latest
47+
runs-on: macos-11
4848
steps:
4949
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
5050
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
51-
- name: Select Xcode 12.4
52-
run: sudo xcode-select -s /Applications/Xcode_12.4.app
51+
- name: Select Xcode 12.5
52+
run: sudo xcode-select -s /Applications/Xcode_12.5.app
5353
- name: Run Bluepill tests
5454
run: ./scripts/bluepill.sh runner_tests
5555
- name: Capture xcresult files

.github/workflows/master.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
# First machine, runs BP tests batch 1
1212
integration_tests1:
1313
name: Instance Test 1
14-
runs-on: macos-latest
14+
runs-on: macos-11
1515
steps:
1616
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
1717
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
18-
- name: Select Xcode 12.4
19-
run: sudo xcode-select -s /Applications/Xcode_12.4.app
18+
- name: Select Xcode 12.5
19+
run: sudo xcode-select -s /Applications/Xcode_12.5.app
2020
- name: Run Bluepill tests
2121
run: ./scripts/bluepill.sh instance_tests1
2222
- name: Capture xcresult files
@@ -30,12 +30,12 @@ jobs:
3030
# Second machine, runs BP tests batch 2
3131
integration_tests2:
3232
name: Instance Test 2
33-
runs-on: macos-latest
33+
runs-on: macos-11
3434
steps:
3535
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
3636
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
37-
- name: Select Xcode 12.4
38-
run: sudo xcode-select -s /Applications/Xcode_12.4.app
37+
- name: Select Xcode 12.5
38+
run: sudo xcode-select -s /Applications/Xcode_12.5.app
3939
- name: Run Bluepill tests
4040
run: ./scripts/bluepill.sh instance_tests2
4141
- name: Capture xcresult files
@@ -49,12 +49,12 @@ jobs:
4949
# Third machine, runs Bluepill tests and makes release build
5050
build:
5151
name: Bluepill Test and build
52-
runs-on: macos-latest
52+
runs-on: macos-11
5353
steps:
5454
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
5555
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
56-
- name: Select Xcode 12.4
57-
run: sudo xcode-select -s /Applications/Xcode_12.4.app
56+
- name: Select Xcode 12.5
57+
run: sudo xcode-select -s /Applications/Xcode_12.5.app
5858
- name: Run Bluepill tests
5959
run: ./scripts/bluepill.sh runner_tests
6060
- name: Capture xcresult files

.github/workflows/release.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ jobs:
99
# First machine, runs BP tests batch 1
1010
integration_tests1:
1111
name: Instance Test 1
12-
runs-on: macos-latest
12+
runs-on: macos-11
1313
steps:
1414
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
1515
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
16-
- name: Select Xcode 12.4
17-
run: sudo xcode-select -s /Applications/Xcode_12.4.app
16+
- name: Select Xcode 12.5
17+
run: sudo xcode-select -s /Applications/Xcode_12.5.app
1818
- name: Run Bluepill tests
1919
run: ./scripts/bluepill.sh instance_tests1
2020
- name: Capture xcresult files
@@ -28,12 +28,12 @@ jobs:
2828
# Second machine, runs BP tests batch 2
2929
integration_tests2:
3030
name: Instance Test 2
31-
runs-on: macos-latest
31+
runs-on: macos-11
3232
steps:
3333
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
3434
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
35-
- name: Select Xcode 12.4
36-
run: sudo xcode-select -s /Applications/Xcode_12.4.app
35+
- name: Select Xcode 12.5
36+
run: sudo xcode-select -s /Applications/Xcode_12.5.app
3737
- name: Run Bluepill tests
3838
run: ./scripts/bluepill.sh instance_tests2
3939
- name: Capture xcresult files
@@ -47,15 +47,15 @@ jobs:
4747
# Third machine, runs Bluepill tests and makes release build
4848
build:
4949
name: BP Test and build
50-
runs-on: macos-latest
50+
runs-on: macos-11
5151
steps:
5252
# actions/checkout@v2 but we use the sha because tags can be rewritten in git
5353
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
5454
- name: Report event trigger data
5555
run: |
5656
echo "Event ${{ github.event_name }}, ref: ${{ github.ref }}"
57-
- name: Select Xcode 12.4
58-
run: sudo xcode-select -s /Applications/Xcode_12.4.app
57+
- name: Select Xcode 12.5
58+
run: sudo xcode-select -s /Applications/Xcode_12.5.app
5959
- name: Run Bluepill tests
6060
run: ./scripts/bluepill.sh runner_tests
6161
- name: Capture xcresult files

BPSampleApp/BPSampleAppTests/BPSampleAppTests.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ - (void)tearDown {
2828
}
2929

3030
// Make sure we don't pick up random helper functions that just happen to have _test in their names.
31-
void a_function_that_is_not_a_test() {
31+
void a_function_that_is_not_a_test(void) {
3232
return;
3333
}
3434

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ All notable changes are documented in this file.
44
## [Unreleased]
55

66
### Added
7+
- Support for Xcode 12.5
78
- A Changelog :-)
89

910
### Changed
@@ -15,6 +16,7 @@ All notable changes are documented in this file.
1516
### Deprecated
1617

1718
### Removed
19+
- Support for Xcode versions 12.4 and older.
1820

1921
### Fixed
2022

0 commit comments

Comments
 (0)