Skip to content

Commit

Permalink
Support for Xcode 12.5 (#497)
Browse files Browse the repository at this point in the history
* Switch CI to macOS 11

Signed-off-by: Oscar Bonilla <6f6231@gmail.com>
  • Loading branch information
ob committed Jun 22, 2021
1 parent 0e81960 commit 2bbc979
Show file tree
Hide file tree
Showing 392 changed files with 8,115 additions and 2,724 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/PR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ jobs:
# First machine, runs BP tests batch 1
integration_tests1:
name: Instance Test 1
runs-on: macos-latest
runs-on: macos-11
steps:
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
- name: Select Xcode 12.4
run: sudo xcode-select -s /Applications/Xcode_12.4.app
- name: Select Xcode 12.5
run: sudo xcode-select -s /Applications/Xcode_12.5.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh instance_tests1
- name: Capture xcresult files
Expand All @@ -25,12 +25,12 @@ jobs:
# Second machine, runs BP tests batch 2
integration_tests2:
name: Instance Test 2
runs-on: macos-latest
runs-on: macos-11
steps:
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
- name: Select Xcode 12.4
run: sudo xcode-select -s /Applications/Xcode_12.4.app
- name: Select Xcode 12.5
run: sudo xcode-select -s /Applications/Xcode_12.5.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh instance_tests2
- name: Capture xcresult files
Expand All @@ -44,12 +44,12 @@ jobs:
# Third machine, runs Bluepill tests and makes release build
build:
name: Bluepill Test and build
runs-on: macos-latest
runs-on: macos-11
steps:
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
- name: Select Xcode 12.4
run: sudo xcode-select -s /Applications/Xcode_12.4.app
- name: Select Xcode 12.5
run: sudo xcode-select -s /Applications/Xcode_12.5.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh runner_tests
- name: Capture xcresult files
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:
# First machine, runs BP tests batch 1
integration_tests1:
name: Instance Test 1
runs-on: macos-latest
runs-on: macos-11
steps:
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
- name: Select Xcode 12.4
run: sudo xcode-select -s /Applications/Xcode_12.4.app
- name: Select Xcode 12.5
run: sudo xcode-select -s /Applications/Xcode_12.5.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh instance_tests1
- name: Capture xcresult files
Expand All @@ -30,12 +30,12 @@ jobs:
# Second machine, runs BP tests batch 2
integration_tests2:
name: Instance Test 2
runs-on: macos-latest
runs-on: macos-11
steps:
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
- name: Select Xcode 12.4
run: sudo xcode-select -s /Applications/Xcode_12.4.app
- name: Select Xcode 12.5
run: sudo xcode-select -s /Applications/Xcode_12.5.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh instance_tests2
- name: Capture xcresult files
Expand All @@ -49,12 +49,12 @@ jobs:
# Third machine, runs Bluepill tests and makes release build
build:
name: Bluepill Test and build
runs-on: macos-latest
runs-on: macos-11
steps:
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
- name: Select Xcode 12.4
run: sudo xcode-select -s /Applications/Xcode_12.4.app
- name: Select Xcode 12.5
run: sudo xcode-select -s /Applications/Xcode_12.5.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh runner_tests
- name: Capture xcresult files
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ jobs:
# First machine, runs BP tests batch 1
integration_tests1:
name: Instance Test 1
runs-on: macos-latest
runs-on: macos-11
steps:
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
- name: Select Xcode 12.4
run: sudo xcode-select -s /Applications/Xcode_12.4.app
- name: Select Xcode 12.5
run: sudo xcode-select -s /Applications/Xcode_12.5.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh instance_tests1
- name: Capture xcresult files
Expand All @@ -28,12 +28,12 @@ jobs:
# Second machine, runs BP tests batch 2
integration_tests2:
name: Instance Test 2
runs-on: macos-latest
runs-on: macos-11
steps:
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
- name: Select Xcode 12.4
run: sudo xcode-select -s /Applications/Xcode_12.4.app
- name: Select Xcode 12.5
run: sudo xcode-select -s /Applications/Xcode_12.5.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh instance_tests2
- name: Capture xcresult files
Expand All @@ -47,15 +47,15 @@ jobs:
# Third machine, runs Bluepill tests and makes release build
build:
name: BP Test and build
runs-on: macos-latest
runs-on: macos-11
steps:
# actions/checkout@v2 but we use the sha because tags can be rewritten in git
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
- name: Report event trigger data
run: |
echo "Event ${{ github.event_name }}, ref: ${{ github.ref }}"
- name: Select Xcode 12.4
run: sudo xcode-select -s /Applications/Xcode_12.4.app
- name: Select Xcode 12.5
run: sudo xcode-select -s /Applications/Xcode_12.5.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh runner_tests
- name: Capture xcresult files
Expand Down
2 changes: 1 addition & 1 deletion BPSampleApp/BPSampleAppTests/BPSampleAppTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ - (void)tearDown {
}

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

Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ All notable changes are documented in this file.
## [Unreleased]

### Added
- Support for Xcode 12.5
- A Changelog :-)

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

### Removed
- Support for Xcode versions 12.4 and older.

### Fixed

Expand Down

0 comments on commit 2bbc979

Please sign in to comment.