Skip to content

Commit d5e9b14

Browse files
author
Alex Ames
committed
Merge branch 'main' into bugfix/database-sync-point-test-fixes
2 parents 3a14ae6 + 7b410d8 commit d5e9b14

File tree

40 files changed

+192
-143
lines changed

40 files changed

+192
-143
lines changed

.github/workflows/check-labels.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/checks.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Checks
2+
3+
on:
4+
pull_request:
5+
types: [opened, reopened, synchronize, labeled, unlabeled]
6+
7+
env:
8+
triggerLabelFull: "tests-requested: full"
9+
triggerLabelQuick: "tests-requested: quick"
10+
statusLabelInProgress: "tests: in-progress"
11+
statusLabelFailed: "tests: failed"
12+
13+
jobs:
14+
file_format_check:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v2
18+
with:
19+
submodules: false
20+
- name: Setup python
21+
uses: actions/setup-python@v2
22+
with:
23+
python-version: 3.7
24+
- name: Install prerequisites
25+
run: python scripts/gha/install_prereqs_desktop.py
26+
- name: log clang format version
27+
shell: bash
28+
run: clang-format --version
29+
- name: git fetch origin main
30+
shell: bash
31+
run: git fetch origin main
32+
- name: Detect Formatting Changes
33+
shell: bash
34+
run: python3 scripts/format_code.py -git_diff -noformat_file -verbose
35+
36+
check_integration_test_labels:
37+
# This check fails if integration tests are queued, in progress, or failed.
38+
runs-on: ubuntu-latest
39+
steps:
40+
- uses: docker://agilepathway/pull-request-label-checker:latest
41+
with:
42+
none_of: "${{ env.statusLabelInProgress }},${{ env.statusLabelFailed }},${{ env.triggerLabelFull }},${{ env.triggerLabelQuick }}"
43+
repo_token: ${{ github.token }}
44+
45+

CONTRIBUTING.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,11 @@ Before you submit your pull request consider the following guidelines:
118118
* Follow our [Coding Rules](#rules).
119119
* Avoid checking in files that shouldn't be tracked (e.g `.tmp`, `.idea`).
120120
We recommend using a [global](#global-gitignore) gitignore for this.
121+
* Format your code:
122+
```shell
123+
python3 scripts/format_code.py -git_diff -verbose
124+
```
125+
121126
* Commit your changes using a descriptive commit message.
122127
123128
```shell

admob/integration_test/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ platform :ios, '10.0'
44
# Firebase AdMob test application.
55

66
target 'integration_test' do
7-
pod 'Firebase/AdMob', '7.10.0'
7+
pod 'Firebase/AdMob', '7.11.0'
88
end
99

1010
post_install do |installer|

admob/integration_test/integration_test.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@
279279
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
280280
GCC_WARN_UNUSED_FUNCTION = YES;
281281
GCC_WARN_UNUSED_VARIABLE = YES;
282-
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
282+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
283283
MTL_ENABLE_DEBUG_INFO = YES;
284284
ONLY_ACTIVE_ARCH = YES;
285285
SDKROOT = iphoneos;
@@ -316,7 +316,7 @@
316316
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
317317
GCC_WARN_UNUSED_FUNCTION = YES;
318318
GCC_WARN_UNUSED_VARIABLE = YES;
319-
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
319+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
320320
MTL_ENABLE_DEBUG_INFO = NO;
321321
SDKROOT = iphoneos;
322322
TARGETED_DEVICE_FAMILY = "1,2";

analytics/integration_test/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ platform :ios, '10.0'
44
# Firebase Analytics test application.
55

66
target 'integration_test' do
7-
pod 'Firebase/Analytics', '7.10.0'
7+
pod 'Firebase/Analytics', '7.11.0'
88
end
99

1010
post_install do |installer|

analytics/integration_test/integration_test.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
237237
GCC_WARN_UNUSED_FUNCTION = YES;
238238
GCC_WARN_UNUSED_VARIABLE = YES;
239-
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
239+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
240240
MTL_ENABLE_DEBUG_INFO = YES;
241241
ONLY_ACTIVE_ARCH = YES;
242242
SDKROOT = iphoneos;
@@ -273,7 +273,7 @@
273273
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
274274
GCC_WARN_UNUSED_FUNCTION = YES;
275275
GCC_WARN_UNUSED_VARIABLE = YES;
276-
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
276+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
277277
MTL_ENABLE_DEBUG_INFO = NO;
278278
SDKROOT = iphoneos;
279279
TARGETED_DEVICE_FAMILY = "1,2";

app/integration_test/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ platform :ios, '10.0'
44
# Firebase App test application.
55

66
target 'integration_test' do
7-
pod 'Firebase/Analytics', '7.10.0'
7+
pod 'Firebase/Analytics', '7.11.0'
88
end
99

1010
post_install do |installer|

app/integration_test/integration_test.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
237237
GCC_WARN_UNUSED_FUNCTION = YES;
238238
GCC_WARN_UNUSED_VARIABLE = YES;
239-
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
239+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
240240
MTL_ENABLE_DEBUG_INFO = YES;
241241
ONLY_ACTIVE_ARCH = YES;
242242
SDKROOT = iphoneos;
@@ -273,7 +273,7 @@
273273
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
274274
GCC_WARN_UNUSED_FUNCTION = YES;
275275
GCC_WARN_UNUSED_VARIABLE = YES;
276-
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
276+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
277277
MTL_ENABLE_DEBUG_INFO = NO;
278278
SDKROOT = iphoneos;
279279
TARGETED_DEVICE_FAMILY = "1,2";

auth/integration_test/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ platform :ios, '10.0'
44
# Firebase Auth test application.
55

66
target 'integration_test' do
7-
pod 'Firebase/Auth', '7.10.0'
7+
pod 'Firebase/Auth', '7.11.0'
88
end
99

1010
post_install do |installer|

0 commit comments

Comments
 (0)