Skip to content

Commit 97bb568

Browse files
Add App Check to the packaging logic (#1292)
* Add App Check logic to the GHA CI * Disable the failure tests * Formatting * Update debug_token_request.h * Update app_check_android.cc * Update integration_test.cc * Update integration_test.cc * Simplify the App Check test * Update integration_test.cc * Update integration_test.cc --------- Co-authored-by: Jon Simantov <[email protected]>
1 parent 2085091 commit 97bb568

File tree

16 files changed

+30
-425
lines changed

16 files changed

+30
-425
lines changed

.github/workflows/cpp-packaging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ jobs:
827827
-w integration_tests.yml \
828828
-p test_packaged_sdk ${{ github.run_id }} \
829829
-p use_expanded_matrix ${USE_EXPANDED_MATRIX} \
830-
-p apis "analytics,auth,database,dynamic_links,functions,installations,messaging,remote_config,storage" \
830+
-p apis "analytics,app_check,auth,database,dynamic_links,functions,installations,messaging,remote_config,storage" \
831831
-p test_pull_request nightly-packaging \
832832
-s 10 \
833833
-A ${verbose_flag}

.github/workflows/integration_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
required: true
1818
apis:
1919
description: 'CSV of apis to build and test'
20-
default: 'analytics,auth,database,dynamic_links,firestore,functions,gma,installations,messaging,remote_config,storage'
20+
default: 'analytics,app_check,auth,database,dynamic_links,firestore,functions,gma,installations,messaging,remote_config,storage'
2121
required: true
2222
operating_systems:
2323
description: 'CSV of VMs to run on'
@@ -187,7 +187,7 @@ jobs:
187187
# list. Then we can use fromJson to define the field in the matrix for the tests job.
188188
if [[ "${{ github.event.schedule }}" == "0 9 * * *" ]]; then
189189
# at 1am PST/2am PDT. Running integration tests and generate test report for all testapps except firestore
190-
apis="analytics,auth,database,dynamic_links,functions,gma,installations,messaging,remote_config,storage"
190+
apis="analytics,app_check,auth,database,dynamic_links,functions,gma,installations,messaging,remote_config,storage"
191191
elif [[ "${{ github.event.schedule }}" == "0 10 * * *" || "${{ github.event.schedule }}" == "0 11 * * *" ]]; then
192192
# at 2am PST/3am PDT and 3am PST/4am PDT. Running integration tests for firestore and generate test report.
193193
apis="firestore"

app_check/integration_test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ endif()
235235
# Add the Firebase libraries to the target using the function from the SDK.
236236
add_subdirectory(${FIREBASE_CPP_SDK_DIR} bin/ EXCLUDE_FROM_ALL)
237237
# Note that firebase_app needs to be last in the list.
238-
set(firebase_libs firebase_app_check firebase_database firebase_storage firebase_functions firebase_firestore firebase_auth firebase_app)
238+
set(firebase_libs firebase_app_check firebase_database firebase_storage firebase_functions firebase_auth firebase_app)
239239
set(gtest_libs gtest gmock)
240240
target_link_libraries(${integration_test_target_name} ${firebase_libs}
241241
${gtest_libs} ${ADDITIONAL_LIBS})

app_check/integration_test/Podfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ target 'integration_test' do
99
pod 'Firebase/Auth', '10.9.0'
1010
pod 'Firebase/Storage', '10.9.0'
1111
pod 'Firebase/Functions', '10.9.0'
12-
pod 'Firebase/Firestore', '10.9.0'
1312
end
1413

1514
target 'integration_test_tvos' do
@@ -19,7 +18,6 @@ target 'integration_test_tvos' do
1918
pod 'Firebase/Auth', '10.9.0'
2019
pod 'Firebase/Storage', '10.9.0'
2120
pod 'Firebase/Functions', '10.9.0'
22-
pod 'Firebase/Firestore', '10.9.0'
2321
end
2422

2523
post_install do |installer|

app_check/integration_test/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ android {
6565
"-DFIREBASE_INCLUDE_AUTH=ON",
6666
"-DFIREBASE_INCLUDE_DATABASE=ON",
6767
"-DFIREBASE_INCLUDE_STORAGE=ON",
68-
"-DFIREBASE_INCLUDE_FUNCTIONS=ON",
69-
"-DFIREBASE_INCLUDE_FIRESTORE=ON"
68+
"-DFIREBASE_INCLUDE_FUNCTIONS=ON"
7069
}
7170
multiDexEnabled true
7271
}
@@ -95,7 +94,6 @@ firebaseCpp.dependencies {
9594
database
9695
storage
9796
functions
98-
firestore
9997
}
10098

10199
apply plugin: 'com.google.gms.google-services'

app_check/integration_test/integration_test.xcodeproj/xcshareddata/xcschemes/integration_test.xcscheme

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,6 @@
5050
ReferencedContainer = "container:integration_test.xcodeproj">
5151
</BuildableReference>
5252
</BuildableProductRunnable>
53-
<EnvironmentVariables>
54-
<EnvironmentVariable
55-
key = "FIRAAppCheckDebugToken"
56-
value = "REPLACE_WITH_APP_CHECK_TOKEN"
57-
isEnabled = "YES">
58-
</EnvironmentVariable>
59-
</EnvironmentVariables>
6053
</LaunchAction>
6154
<ProfileAction
6255
buildConfiguration = "Release"

app_check/integration_test/integration_test.xcodeproj/xcshareddata/xcschemes/integration_test_tvos.xcscheme

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,6 @@
5050
ReferencedContainer = "container:integration_test.xcodeproj">
5151
</BuildableReference>
5252
</BuildableProductRunnable>
53-
<EnvironmentVariables>
54-
<EnvironmentVariable
55-
key = "FIRAAppCheckDebugToken"
56-
value = "REPLACE_WITH_APP_CHECK_TOKEN"
57-
isEnabled = "YES">
58-
</EnvironmentVariable>
59-
</EnvironmentVariables>
6053
</LaunchAction>
6154
<ProfileAction
6255
buildConfiguration = "Release"

0 commit comments

Comments
 (0)