Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Housekeeping. Misc project changes #468

Merged
merged 7 commits into from
Jan 19, 2021
Merged

Housekeeping. Misc project changes #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
65dcb34
Specify ARCHS for bp and bluepill projects
chenxiao0228 Jan 8, 2021
e91d7c4
Scheme clean up
chenxiao0228 Jan 10, 2021
6802cde
Added build step to capture xcresult files for analysis
chenxiao0228 Jan 11, 2021
df8e000
Make the artifact name consistent
chenxiao0228 Jan 15, 2021
9dcbc8e
Build the sample app with x86_64 only
chenxiao0228 Jan 15, 2021
846bf82
Use 3 machines to run tests
chenxiao0228 Jan 15, 2021
f92935e
Move capture xcresult up
chenxiao0228 Jan 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 40 additions & 7 deletions .github/workflows/PR.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,61 @@ name: PR
on: pull_request

jobs:
# First machine, runs Bluepill tests
integration_tests:
name: Bluepill Test
# First machine, runs BP tests batch 1
integration_tests1:
name: Instance Test 1
runs-on: macos-latest
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
run: sudo xcode-select -s /Applications/Xcode_12.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh instance_tests
run: ./scripts/bluepill.sh instance_tests1
- name: Capture xcresult files
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: xcresults-bp-tests1
path: build/**/*.xcresult
retention-days: 14

# Second machine, runs BP tests and makes build
# Second machine, runs BP tests batch 2
integration_tests2:
name: Instance Test 2
runs-on: macos-latest
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
run: sudo xcode-select -s /Applications/Xcode_12.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh instance_tests2
- name: Capture xcresult files
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: xcresults-bp-tests2
path: build/**/*.xcresult
retention-days: 14

# Third machine, runs Bluepill tests and makes release build
build:
name: BP Test and build
name: Bluepill Test and build
runs-on: macos-latest
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
run: sudo xcode-select -s /Applications/Xcode_12.app
- name: Run BP tests
- name: Run Bluepill tests
run: ./scripts/bluepill.sh runner_tests
- name: Capture xcresult files
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: xcresults-bluepill-tests
path: build/**/*.xcresult
retention-days: 14
- name: Build and Package
run: ./scripts/bluepill.sh build
71 changes: 52 additions & 19 deletions .github/workflows/master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,61 @@ on:
- '*'

jobs:
# First machine, runs Bluepill tests
integration_tests:
name: Bluepill Test
# First machine, runs BP tests batch 1
integration_tests1:
name: Instance Test 1
runs-on: macos-latest
steps:
# actions/checkout@v2 but we use the sha because tags can be rewritten in git
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
- name: Select Xcode 12
run: sudo xcode-select -s /Applications/Xcode_12.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh instance_tests
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
- name: Select Xcode 12
run: sudo xcode-select -s /Applications/Xcode_12.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh instance_tests1
- name: Capture xcresult files
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: xcresults-bp-tests1
path: build/**/*.xcresult
retention-days: 14

# Second machine, runs BP tests and makes build
# Second machine, runs BP tests batch 2
integration_tests2:
name: Instance Test 2
runs-on: macos-latest
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
run: sudo xcode-select -s /Applications/Xcode_12.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh instance_tests2
- name: Capture xcresult files
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: xcresults-bp-tests2
path: build/**/*.xcresult
retention-days: 14

# Third machine, runs Bluepill tests and makes release build
build:
name: BP Test and build
name: Bluepill Test and build
runs-on: macos-latest
steps:
# actions/checkout@v2 but we use the sha because tags can be rewritten in git
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
- name: Select Xcode 12
run: sudo xcode-select -s /Applications/Xcode_12.app
- name: Run BP tests
run: ./scripts/bluepill.sh runner_tests
- name: Build and Package
run: ./scripts/bluepill.sh build
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
- name: Select Xcode 12
run: sudo xcode-select -s /Applications/Xcode_12.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh runner_tests
- name: Capture xcresult files
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: xcresults-bluepill-tests
path: build/**/*.xcresult
retention-days: 14
- name: Build and Package
run: ./scripts/bluepill.sh build
53 changes: 43 additions & 10 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,45 @@ on:
- 'v*.*.*'

jobs:
# First machine, runs Bluepill tests
integration_tests:
name: Bluepill Test
# First machine, runs BP tests batch 1
integration_tests1:
name: Instance Test 1
runs-on: macos-latest
steps:
# actions/checkout@v2 but we use the sha because tags can be rewritten in git
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
- name: Select Xcode 12
run: sudo xcode-select -s /Applications/Xcode_12.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh instance_tests
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
- name: Select Xcode 12
run: sudo xcode-select -s /Applications/Xcode_12.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh instance_tests1
- name: Capture xcresult files
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: xcresults-bp-tests1
path: build/**/*.xcresult
retention-days: 14

# Second machine, runs BP tests and makes build
# Second machine, runs BP tests batch 2
integration_tests2:
name: Instance Test 2
runs-on: macos-latest
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
run: sudo xcode-select -s /Applications/Xcode_12.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh instance_tests2
- name: Capture xcresult files
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: xcresults-bp-tests2
path: build/**/*.xcresult
retention-days: 14

# Third machine, runs Bluepill tests and makes release build
build:
name: BP Test and build
runs-on: macos-latest
Expand All @@ -32,6 +58,13 @@ jobs:
run: sudo xcode-select -s /Applications/Xcode_12.app
- name: Run Bluepill tests
run: ./scripts/bluepill.sh runner_tests
- name: Capture xcresult files
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: xcresults-bluepill-tests
path: build/**/*.xcresult
retention-days: 14
- name: Build Bluepill
run: ./scripts/bluepill.sh build
- name: Release
Expand Down
2 changes: 2 additions & 0 deletions bluepill/bluepill.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@
baseConfigurationReference = BAFCCA361E33595F00E33C31 /* bluepill.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ARCHS = x86_64;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down Expand Up @@ -487,6 +488,7 @@
baseConfigurationReference = BAFCCA361E33595F00E33C31 /* bluepill.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ARCHS = x86_64;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down
Loading