From c74af70a6010795f20cc23e5fe1c63d371934464 Mon Sep 17 00:00:00 2001 From: Mou Date: Wed, 30 Nov 2022 16:06:20 -0800 Subject: [PATCH 01/20] test cmake build --- cmake/external/firestore.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake index 9d30ec7bcc..f1c7b7f92a 100644 --- a/cmake/external/firestore.cmake +++ b/cmake/external/firestore.cmake @@ -64,6 +64,7 @@ endfunction() if((NOT FIRESTORE_DEP_SOURCE) OR (FIRESTORE_DEP_SOURCE STREQUAL "RELEASED")) # Get from released dependency by default + message("FIRESTORE_DEP_SOURCE value: ${FIRESTORE_DEP_SOURCE}") GetReleasedDep() else() if(FIRESTORE_DEP_SOURCE STREQUAL "TIP") From f63f53a4abe72cdcbd1cbdfa087122931bc30009 Mon Sep 17 00:00:00 2001 From: Mou Date: Wed, 30 Nov 2022 16:13:47 -0800 Subject: [PATCH 02/20] test against TIP --- .github/workflows/integration_tests.yml | 1 + cmake/external/firestore.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 0d44f9cce9..70fb68c398 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -318,6 +318,7 @@ jobs: additional_flags+=(--cmake_flag=-DFIREBASE_USE_BORINGSSL=ON) fi fi + additional_flags+=(--cmake_flag=-DFIRESTORE_DEP_SOURCE=TIP) python scripts/gha/build_testapps.py --p Desktop \ --t ${{ needs.check_and_prepare.outputs.apis }} \ --output_directory "${{ github.workspace }}" \ diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake index f1c7b7f92a..b8dbce7a37 100644 --- a/cmake/external/firestore.cmake +++ b/cmake/external/firestore.cmake @@ -62,9 +62,9 @@ function(GetTag t) ) endfunction() +message("FIRESTORE_DEP_SOURCE value: ${FIRESTORE_DEP_SOURCE}") if((NOT FIRESTORE_DEP_SOURCE) OR (FIRESTORE_DEP_SOURCE STREQUAL "RELEASED")) # Get from released dependency by default - message("FIRESTORE_DEP_SOURCE value: ${FIRESTORE_DEP_SOURCE}") GetReleasedDep() else() if(FIRESTORE_DEP_SOURCE STREQUAL "TIP") From 426b907a4e53e6e736c21cf39ce4348a3c530c81 Mon Sep 17 00:00:00 2001 From: Mou Date: Mon, 5 Dec 2022 13:42:12 -0800 Subject: [PATCH 03/20] test desktop build --- scripts/gha/build_desktop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gha/build_desktop.py b/scripts/gha/build_desktop.py index f23f793a8a..2ac2b9e94e 100644 --- a/scripts/gha/build_desktop.py +++ b/scripts/gha/build_desktop.py @@ -288,7 +288,7 @@ def parse_cmdline_args(): parser.add_argument('--target', nargs='+', help='A list of CMake build targets (eg: firebase_app firebase_auth)') parser.add_argument('--target_format', default=None, help='(Mac only) whether to output frameworks (default) or libraries.') parser.add_argument('--use_openssl', action='store_true', default=None, help='Use openssl for build instead of boringssl') - parser.add_argument('--firestore_dep_source', default='RELEASED', help='Where to get Firestore C++ Core source code. "RELEASED"/"TIP"/(Git tag/branch/commit)') + parser.add_argument('--firestore_dep_source', default='TIP', help='Where to get Firestore C++ Core source code. "RELEASED"/"TIP"/(Git tag/branch/commit)') parser.add_argument('--gha_build', action='store_true', default=None, help='Set to true when building on GitHub, for metric tracking purposes (also changes some prerequisite installation behavior).') args = parser.parse_args() return args From 2887b9577083900b2398ba900ed5b02d97275208 Mon Sep 17 00:00:00 2001 From: Mou Date: Mon, 5 Dec 2022 13:50:33 -0800 Subject: [PATCH 04/20] get error log --- .github/workflows/integration_tests.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 70fb68c398..da0d47191f 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -328,6 +328,13 @@ jobs: --gha_build \ --arch ${{ matrix.arch }} \ ${additional_flags[*]} + - name: Upload Desktop Cmake + uses: actions/upload-artifact@v3 + if: ${{ !cancelled() }} + with: + name: cmake + path: D:/a/firebase-cpp-sdk/firebase-cpp-sdk/ta/firestore/iti/CMakeFiles/ + retention-days: 1 - name: Prepare results summary artifact if: ${{ !cancelled() }} shell: bash From 92e876280562e75920d07e64f09b7b4fcffdc580 Mon Sep 17 00:00:00 2001 From: Mou Date: Mon, 5 Dec 2022 14:59:29 -0800 Subject: [PATCH 05/20] update cmake flag --- .github/workflows/integration_tests.yml | 2 +- scripts/gha/build_testapps.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index da0d47191f..115acfd320 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -332,7 +332,7 @@ jobs: uses: actions/upload-artifact@v3 if: ${{ !cancelled() }} with: - name: cmake + name: cmake-${{ matrix.ssl_variant }} path: D:/a/firebase-cpp-sdk/firebase-cpp-sdk/ta/firestore/iti/CMakeFiles/ retention-days: 1 - name: Prepare results summary artifact diff --git a/scripts/gha/build_testapps.py b/scripts/gha/build_testapps.py index 7a2960a58f..0746049fd1 100644 --- a/scripts/gha/build_testapps.py +++ b/scripts/gha/build_testapps.py @@ -476,10 +476,12 @@ def _summarize_results(testapps, platforms, failures, root_output_dir, artifact_ def _build_desktop(sdk_dir, cmake_flags): cmake_configure_cmd = ["cmake", ".", "-DCMAKE_BUILD_TYPE=Debug", - "-DFIREBASE_CPP_SDK_DIR=" + sdk_dir] + "-DFIREBASE_CPP_SDK_DIR=" + sdk_dir, + "-DFIREBASE_GITHUB_ACTION_BUILD=ON"] if utils.is_windows_os(): cmake_configure_cmd += ["-A", "Win32" if FLAGS.arch == "x86" else FLAGS.arch] + cmake_configure_cmd += ["-DMSVC_RUNTIME_LIBRARY_STATIC=ON"] elif utils.is_mac_os(): # Ensure that correct Mac architecture is built. cmake_configure_cmd += ["-DCMAKE_OSX_ARCHITECTURES=%s" % From a4bcfc607e7e76b1ec4c65c1c1d4698c611a8ef5 Mon Sep 17 00:00:00 2001 From: Mou Date: Mon, 5 Dec 2022 15:32:17 -0800 Subject: [PATCH 06/20] get artifact --- .github/workflows/desktop.yml | 8 ++++++++ .github/workflows/integration_tests.yml | 2 +- scripts/gha/build_testapps.py | 4 +--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index d294034dec..67002572b2 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -182,6 +182,14 @@ jobs: run: | python scripts/gha/build_desktop.py --build_tests --arch "${{ matrix.architecture }}" --config "${{ matrix.build_type }}" --msvc_runtime_library "${{ matrix.msvc_runtime }}" --gha_build + - name: Upload Desktop Cmake + uses: actions/upload-artifact@v3 + if: ${{ !cancelled() }} + with: + name: cmake-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.architecture }}-${{ matrix.msvc_runtime }} + path: D:/a/firebase-cpp-sdk/firebase-cpp-sdk/build/CMakeFiles/ + retention-days: 1 + - name: Stats for ccache (mac and linux) if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos') run: ccache -s diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 115acfd320..7d50991cd7 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -326,7 +326,7 @@ jobs: --noadd_timestamp \ --short_output_paths \ --gha_build \ - --arch ${{ matrix.arch }} \ + --arch ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.arch }} \ ${additional_flags[*]} - name: Upload Desktop Cmake uses: actions/upload-artifact@v3 diff --git a/scripts/gha/build_testapps.py b/scripts/gha/build_testapps.py index 0746049fd1..7a2960a58f 100644 --- a/scripts/gha/build_testapps.py +++ b/scripts/gha/build_testapps.py @@ -476,12 +476,10 @@ def _summarize_results(testapps, platforms, failures, root_output_dir, artifact_ def _build_desktop(sdk_dir, cmake_flags): cmake_configure_cmd = ["cmake", ".", "-DCMAKE_BUILD_TYPE=Debug", - "-DFIREBASE_CPP_SDK_DIR=" + sdk_dir, - "-DFIREBASE_GITHUB_ACTION_BUILD=ON"] + "-DFIREBASE_CPP_SDK_DIR=" + sdk_dir] if utils.is_windows_os(): cmake_configure_cmd += ["-A", "Win32" if FLAGS.arch == "x86" else FLAGS.arch] - cmake_configure_cmd += ["-DMSVC_RUNTIME_LIBRARY_STATIC=ON"] elif utils.is_mac_os(): # Ensure that correct Mac architecture is built. cmake_configure_cmd += ["-DCMAKE_OSX_ARCHITECTURES=%s" % From 57db77d7a9c9480a687afe443788e18f8d8addbc Mon Sep 17 00:00:00 2001 From: Mou Date: Tue, 6 Dec 2022 11:25:10 -0800 Subject: [PATCH 07/20] fix arch --- .github/workflows/integration_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 7d50991cd7..f1fcac4b5c 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -326,13 +326,13 @@ jobs: --noadd_timestamp \ --short_output_paths \ --gha_build \ - --arch ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.arch }} \ + --arch ${{ matrix.arch }} \ ${additional_flags[*]} - name: Upload Desktop Cmake uses: actions/upload-artifact@v3 if: ${{ !cancelled() }} with: - name: cmake-${{ matrix.ssl_variant }} + name: cmake-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.arch }} path: D:/a/firebase-cpp-sdk/firebase-cpp-sdk/ta/firestore/iti/CMakeFiles/ retention-days: 1 - name: Prepare results summary artifact From a0c55eb8e78d38705323e4acde7a929e4f4cdfe0 Mon Sep 17 00:00:00 2001 From: Mou Date: Tue, 6 Dec 2022 12:39:30 -0800 Subject: [PATCH 08/20] fix artifact name --- .github/workflows/integration_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index f1fcac4b5c..02a4f7490b 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -332,7 +332,7 @@ jobs: uses: actions/upload-artifact@v3 if: ${{ !cancelled() }} with: - name: cmake-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.arch }} + name: cmake-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }} path: D:/a/firebase-cpp-sdk/firebase-cpp-sdk/ta/firestore/iti/CMakeFiles/ retention-days: 1 - name: Prepare results summary artifact From 99f15d662f5bfa584eefafa1710d0562555c5c17 Mon Sep 17 00:00:00 2001 From: Mou Date: Tue, 6 Dec 2022 12:49:11 -0800 Subject: [PATCH 09/20] throw build desktop errors --- scripts/gha/build_desktop.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/gha/build_desktop.py b/scripts/gha/build_desktop.py index 2ac2b9e94e..1dfef594ba 100644 --- a/scripts/gha/build_desktop.py +++ b/scripts/gha/build_desktop.py @@ -230,7 +230,7 @@ def cmake_configure(build_dir, arch, msvc_runtime_library='static', linux_abi='l if verbose: cmd.append('-DCMAKE_VERBOSE_MAKEFILE=1') - utils.run_command(cmd) + utils.run_command(cmd, check=True) def main(): args = parse_cmdline_args() @@ -269,7 +269,7 @@ def main(): # Example: cmake --build build -j 8 --target firebase_app firebase_auth cmd.append('--target') cmd.extend(args.target) - utils.run_command(cmd) + utils.run_command(cmd, check=True) def parse_cmdline_args(): From a4b4c1690e5692d02137db334ee3f0eaf9aff07e Mon Sep 17 00:00:00 2001 From: Mou Date: Tue, 6 Dec 2022 14:40:35 -0800 Subject: [PATCH 10/20] add firestore test against tip report --- .github/workflows/desktop.yml | 8 ------ .github/workflows/integration_tests.yml | 28 +++++++++++++++----- cmake/external/firestore.cmake | 1 - scripts/gha/build_desktop.py | 2 +- scripts/gha/it_workflow.py | 35 ++++++++++++++++++++----- 5 files changed, 50 insertions(+), 24 deletions(-) diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index 67002572b2..d294034dec 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -182,14 +182,6 @@ jobs: run: | python scripts/gha/build_desktop.py --build_tests --arch "${{ matrix.architecture }}" --config "${{ matrix.build_type }}" --msvc_runtime_library "${{ matrix.msvc_runtime }}" --gha_build - - name: Upload Desktop Cmake - uses: actions/upload-artifact@v3 - if: ${{ !cancelled() }} - with: - name: cmake-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.architecture }}-${{ matrix.msvc_runtime }} - path: D:/a/firebase-cpp-sdk/firebase-cpp-sdk/build/CMakeFiles/ - retention-days: 1 - - name: Stats for ccache (mac and linux) if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos') run: ccache -s diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 02a4f7490b..ea835bdeb2 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -3,7 +3,8 @@ name: Integration tests on: schedule: - cron: "0 9 * * *" # 9am UTC = 1am PST / 2am PDT. for all testapps except firestore - - cron: "0 10 * * *" # 10am UTC = 2am PST / 3am PDT. for firestore test only + - cron: "0 10 * * *" # 10am UTC = 2am PST / 3am PDT. for firestore test against release iOS/Android SDK + - cron: "0 11 * * *" # 11am UTC = 3am PST / 4am PDT. for firestore desktop test aginst tip-of-tree iOS repo pull_request: types: [ labeled, closed ] @@ -183,16 +184,22 @@ jobs: # To feed input into the job matrix, we first need to convert to a JSON # list. Then we can use fromJson to define the field in the matrix for the tests job. if [[ "${{ github.event.schedule }}" == "0 9 * * *" ]]; then - # at 1am PST / 2am PDT. Running integration tests and generate test report for all testapps except firestore + # at 1am PST/2am PDT. Running integration tests and generate test report for all testapps except firestore apis="admob,analytics,auth,database,dynamic_links,functions,gma,installations,messaging,remote_config,storage" - elif [[ "${{ github.event.schedule }}" == "0 10 * * *" ]]; then - # at 2am PST / 3am PDT. Running integration tests for firestore and generate test report + elif [[ "${{ github.event.schedule }}" == "0 10 * * *" || "${{ github.event.schedule }}" == "0 11 * * *"]]; then + # at 2am PST/3am PDT and 3am PST/4am PDT. Running integration tests for firestore and generate test report. apis="firestore" else apis=$( python scripts/gha/print_matrix_configuration.py -c -w integration_tests -k apis -o "${{github.event.inputs.apis}}" ${TEST_MATRIX_PARAM} ) fi + if [[ "${{ github.event.schedule }}" == "0 11 * * *"]]; then + # at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo + matrix_platform="Desktop" + else + matrix_platform=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k platform -o "${{github.event.inputs.platforms}}" --apis ${apis} ) + fi echo "apis=${apis}" >> $GITHUB_OUTPUT - echo "matrix_platform=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k platform -o "${{github.event.inputs.platforms}}" --apis ${apis} )" >> $GITHUB_OUTPUT + echo "matrix_platform=${matrix_platform}" >> $GITHUB_OUTPUT echo "matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "${{github.event.inputs.operating_systems}}")" >> $GITHUB_OUTPUT echo "matrix_arch_macos=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k architecture_macos)" >> $GITHUB_OUTPUT echo "matrix_arch_windows_linux=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k architecture_windows_linux)" >> $GITHUB_OUTPUT @@ -1363,14 +1370,21 @@ jobs: --run_id ${{github.run_id}} \ --new_token ${{steps.generate-token.outputs.token}} - name: Update Daily Report - if: needs.check_and_prepare.outputs.trigger == 'scheduled_trigger' + # if: needs.check_and_prepare.outputs.trigger == 'scheduled_trigger' shell: bash run: | if [[ "${{ github.event.inputs.test_pull_request }}" == "nightly-packaging" ]]; then additional_flags=(--build_against sdk) else - additional_flags=(--build_against repo) + if [[ "${{ github.event.schedule }}" == "0 11 * * *"]]; then + # at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo + additional_flags=(--build_against tip) + else + additional_flags=(--build_against repo) + fi fi + # test code. remove later. + additional_flags=(--build_against tip) if [[ "${{ needs.check_and_prepare.outputs.apis }}" == "firestore" ]]; then additional_flags+=(--build_apis firestore) else diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake index b8dbce7a37..9d30ec7bcc 100644 --- a/cmake/external/firestore.cmake +++ b/cmake/external/firestore.cmake @@ -62,7 +62,6 @@ function(GetTag t) ) endfunction() -message("FIRESTORE_DEP_SOURCE value: ${FIRESTORE_DEP_SOURCE}") if((NOT FIRESTORE_DEP_SOURCE) OR (FIRESTORE_DEP_SOURCE STREQUAL "RELEASED")) # Get from released dependency by default GetReleasedDep() diff --git a/scripts/gha/build_desktop.py b/scripts/gha/build_desktop.py index 1dfef594ba..8cb5aac08f 100644 --- a/scripts/gha/build_desktop.py +++ b/scripts/gha/build_desktop.py @@ -288,7 +288,7 @@ def parse_cmdline_args(): parser.add_argument('--target', nargs='+', help='A list of CMake build targets (eg: firebase_app firebase_auth)') parser.add_argument('--target_format', default=None, help='(Mac only) whether to output frameworks (default) or libraries.') parser.add_argument('--use_openssl', action='store_true', default=None, help='Use openssl for build instead of boringssl') - parser.add_argument('--firestore_dep_source', default='TIP', help='Where to get Firestore C++ Core source code. "RELEASED"/"TIP"/(Git tag/branch/commit)') + parser.add_argument('--firestore_dep_source', default='RELEASED', help='Where to get Firestore C++ Core source code. "RELEASED"/"TIP"/(Git tag/branch/commit)') parser.add_argument('--gha_build', action='store_true', default=None, help='Set to true when building on GitHub, for metric tracking purposes (also changes some prerequisite installation behavior).') args = parser.parse_args() return args diff --git a/scripts/gha/it_workflow.py b/scripts/gha/it_workflow.py index 4a1ff17cfd..4230f76f6f 100644 --- a/scripts/gha/it_workflow.py +++ b/scripts/gha/it_workflow.py @@ -72,6 +72,9 @@ _COMMENT_TITLE_FLAKY_REPO = "### [build against repo] Integration test with FLAKINESS (succeeded after retry)\n" _COMMENT_TITLE_FAIL_REPO = "### ❌  [build against repo] Integration test FAILED\n" _COMMENT_TITLE_SUCCEED_REPO = "### ✅  [build against repo] Integration test succeeded!\n" +_COMMENT_TITLE_FLAKY_TIP = "### [build against tip] Integration test with FLAKINESS (succeeded after retry)\n" +_COMMENT_TITLE_FAIL_TIP = "### ❌  [build against tip] Integration test FAILED\n" +_COMMENT_TITLE_SUCCEED_TIP = "### ✅  [build against tip] Integration test succeeded!\n" _COMMENT_FLAKY_TRACKER = "\n\nAdd flaky tests to **[go/fpl-cpp-flake-tracker](http://go/fpl-cpp-flake-tracker)**\n" @@ -89,6 +92,7 @@ _BUILD_AGAINST_SDK = "sdk" _BUILD_AGAINST_REPO = "repo" +_BUILD_AGAINST_TIP = "tip" _BUILD_API_ALL = "all" _BUILD_API_FIRESTORE = "firestore" @@ -222,27 +226,44 @@ def test_report(token, actor, commit, run_id, build_against, build_apis): issue_number = _get_issue_number(token, report_title, _REPORT_LABEL) previous_comment = github.get_issue_body(token, issue_number) - [_, previous_comment_repo, previous_comment_sdk] = previous_comment.split(_COMMENT_HIDDEN_DIVIDER) + [_, previous_comment_repo, previous_comment_sdk, previous_comment_tip] = previous_comment.split(_COMMENT_HIDDEN_DIVIDER) success_or_only_flakiness, log_summary = _get_summary_table(token, run_id) if success_or_only_flakiness and not log_summary: # succeeded (without flakiness) - title = _COMMENT_TITLE_SUCCEED_REPO if build_against==_BUILD_AGAINST_REPO else _COMMENT_TITLE_SUCCEED_SDK + if build_against==_BUILD_AGAINST_REPO: + title = _COMMENT_TITLE_SUCCEED_REPO + elif build_against==_BUILD_AGAINST_SDK: + title = _COMMENT_TITLE_SUCCEED_SDK + else: + title = _COMMENT_TITLE_SUCCEED_TIP comment = title + _get_description(actor, commit, run_id) else: if success_or_only_flakiness: # all failures/errors are due to flakiness (succeeded after retry) - title = _COMMENT_TITLE_FLAKY_REPO if build_against==_BUILD_AGAINST_REPO else _COMMENT_TITLE_FLAKY_SDK + if build_against==_BUILD_AGAINST_REPO: + title = _COMMENT_TITLE_FLAKY_REPO + elif build_against==_BUILD_AGAINST_SDK: + title = _COMMENT_TITLE_FLAKY_SDK + else: + title = _COMMENT_TITLE_FLAKY_TIP else: # failures/errors still exist after retry - title = _COMMENT_TITLE_FAIL_REPO if build_against==_BUILD_AGAINST_REPO else _COMMENT_TITLE_FAIL_SDK + if build_against==_BUILD_AGAINST_REPO: + title = _COMMENT_TITLE_FAIL_REPO + elif build_against==_BUILD_AGAINST_SDK: + title = _COMMENT_TITLE_FAIL_SDK + else: + title = _COMMENT_TITLE_FAIL_TIP comment = title + _get_description(actor, commit, run_id) + log_summary + _COMMENT_FLAKY_TRACKER if build_against==_BUILD_AGAINST_REPO: - comment = prefix + _COMMENT_HIDDEN_DIVIDER + comment + _COMMENT_HIDDEN_DIVIDER + previous_comment_sdk + comment = prefix + _COMMENT_HIDDEN_DIVIDER + comment + _COMMENT_HIDDEN_DIVIDER + previous_comment_sdk + _COMMENT_HIDDEN_DIVIDER + previous_comment_tip elif build_against==_BUILD_AGAINST_SDK: - comment = prefix + _COMMENT_HIDDEN_DIVIDER + previous_comment_repo + _COMMENT_HIDDEN_DIVIDER + comment + comment = prefix + _COMMENT_HIDDEN_DIVIDER + previous_comment_repo + _COMMENT_HIDDEN_DIVIDER + comment + _COMMENT_HIDDEN_DIVIDER + previous_comment_tip + else: + comment = prefix + _COMMENT_HIDDEN_DIVIDER + previous_comment_repo + _COMMENT_HIDDEN_DIVIDER + previous_comment_sdk + _COMMENT_HIDDEN_DIVIDER + comment - if (_COMMENT_TITLE_SUCCEED_REPO in comment) and (_COMMENT_TITLE_SUCCEED_SDK in comment): + if (_COMMENT_TITLE_SUCCEED_REPO in comment) and (_COMMENT_TITLE_SUCCEED_SDK in comment) and (build_apis != _BUILD_API_FIRESTORE or _COMMENT_TITLE_SUCCEED_TIP in comment): github.close_issue(token, issue_number) else: github.open_issue(token, issue_number) From a215d4877a88dc9ea4575c5745cd385d98035b5c Mon Sep 17 00:00:00 2001 From: Mou Date: Tue, 6 Dec 2022 14:44:34 -0800 Subject: [PATCH 11/20] fix format --- .github/workflows/integration_tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index ea835bdeb2..5c136a9dea 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -186,13 +186,13 @@ jobs: if [[ "${{ github.event.schedule }}" == "0 9 * * *" ]]; then # at 1am PST/2am PDT. Running integration tests and generate test report for all testapps except firestore apis="admob,analytics,auth,database,dynamic_links,functions,gma,installations,messaging,remote_config,storage" - elif [[ "${{ github.event.schedule }}" == "0 10 * * *" || "${{ github.event.schedule }}" == "0 11 * * *"]]; then + elif [[ "${{ github.event.schedule }}" == "0 10 * * *" || "${{ github.event.schedule }}" == "0 11 * * *" ]]; then # at 2am PST/3am PDT and 3am PST/4am PDT. Running integration tests for firestore and generate test report. apis="firestore" else apis=$( python scripts/gha/print_matrix_configuration.py -c -w integration_tests -k apis -o "${{github.event.inputs.apis}}" ${TEST_MATRIX_PARAM} ) fi - if [[ "${{ github.event.schedule }}" == "0 11 * * *"]]; then + if [[ "${{ github.event.schedule }}" == "0 11 * * *" ]]; then # at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo matrix_platform="Desktop" else @@ -1376,7 +1376,7 @@ jobs: if [[ "${{ github.event.inputs.test_pull_request }}" == "nightly-packaging" ]]; then additional_flags=(--build_against sdk) else - if [[ "${{ github.event.schedule }}" == "0 11 * * *"]]; then + if [[ "${{ github.event.schedule }}" == "0 11 * * *" ]]; then # at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo additional_flags=(--build_against tip) else From abf075f0f2be046b20cd14ce6219f5a72e6d9906 Mon Sep 17 00:00:00 2001 From: Mou Date: Tue, 6 Dec 2022 17:04:22 -0800 Subject: [PATCH 12/20] fix format --- scripts/gha/it_workflow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gha/it_workflow.py b/scripts/gha/it_workflow.py index 4230f76f6f..3a38f79f5d 100644 --- a/scripts/gha/it_workflow.py +++ b/scripts/gha/it_workflow.py @@ -79,7 +79,7 @@ _COMMENT_FLAKY_TRACKER = "\n\nAdd flaky tests to **[go/fpl-cpp-flake-tracker](http://go/fpl-cpp-flake-tracker)**\n" _COMMENT_IDENTIFIER = "integration-test-status-comment" -_COMMENT_HIDDEN_DIVIDER = f'\n\n' +_COMMENT_HIDDEN_DIVIDER = f'\r\n\r\n' _LOG_ARTIFACT_NAME = "log-artifact" _LOG_OUTPUT_DIR = "test_results" From b92c67070f78b9ce1df01f2d4922e77b73123712 Mon Sep 17 00:00:00 2001 From: Mou Date: Tue, 6 Dec 2022 17:52:44 -0800 Subject: [PATCH 13/20] fix format --- scripts/gha/it_workflow.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/gha/it_workflow.py b/scripts/gha/it_workflow.py index 3a38f79f5d..1cc9b77c0d 100644 --- a/scripts/gha/it_workflow.py +++ b/scripts/gha/it_workflow.py @@ -66,15 +66,15 @@ _COMMENT_TITLE_FLAKY = "### Integration test with FLAKINESS (succeeded after retry)\n" _COMMENT_TITLE_FAIL = "### ❌  Integration test FAILED\n" _COMMENT_TITLE_SUCCEED = "### ✅  Integration test succeeded!\n" -_COMMENT_TITLE_FLAKY_SDK = "\n***\n### [build against SDK] Integration test with FLAKINESS (succeeded after retry)\n" -_COMMENT_TITLE_FAIL_SDK = "\n***\n### ❌  [build against SDK] Integration test FAILED\n" -_COMMENT_TITLE_SUCCEED_SDK = "\n***\n### ✅  [build against SDK] Integration test succeeded!\n" _COMMENT_TITLE_FLAKY_REPO = "### [build against repo] Integration test with FLAKINESS (succeeded after retry)\n" _COMMENT_TITLE_FAIL_REPO = "### ❌  [build against repo] Integration test FAILED\n" _COMMENT_TITLE_SUCCEED_REPO = "### ✅  [build against repo] Integration test succeeded!\n" -_COMMENT_TITLE_FLAKY_TIP = "### [build against tip] Integration test with FLAKINESS (succeeded after retry)\n" -_COMMENT_TITLE_FAIL_TIP = "### ❌  [build against tip] Integration test FAILED\n" -_COMMENT_TITLE_SUCCEED_TIP = "### ✅  [build against tip] Integration test succeeded!\n" +_COMMENT_TITLE_FLAKY_SDK = "\n***\n### [build against SDK] Integration test with FLAKINESS (succeeded after retry)\n" +_COMMENT_TITLE_FAIL_SDK = "\n***\n### ❌  [build against SDK] Integration test FAILED\n" +_COMMENT_TITLE_SUCCEED_SDK = "\n***\n### ✅  [build against SDK] Integration test succeeded!\n" +_COMMENT_TITLE_FLAKY_TIP = "\n***\n### [build against tip] Integration test with FLAKINESS (succeeded after retry)\n" +_COMMENT_TITLE_FAIL_TIP = "\n***\n### ❌  [build against tip] Integration test FAILED\n" +_COMMENT_TITLE_SUCCEED_TIP = "\n***\n### ✅  [build against tip] Integration test succeeded!\n" _COMMENT_FLAKY_TRACKER = "\n\nAdd flaky tests to **[go/fpl-cpp-flake-tracker](http://go/fpl-cpp-flake-tracker)**\n" From 6a3f513e8cdd88b41e82e61aa7139ca9bb3592b2 Mon Sep 17 00:00:00 2001 From: Mou Date: Tue, 6 Dec 2022 18:29:57 -0800 Subject: [PATCH 14/20] remove test code --- .github/workflows/integration_tests.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 5c136a9dea..0cde5de2a9 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -325,7 +325,10 @@ jobs: additional_flags+=(--cmake_flag=-DFIREBASE_USE_BORINGSSL=ON) fi fi - additional_flags+=(--cmake_flag=-DFIRESTORE_DEP_SOURCE=TIP) + if [[ "${{ github.event.schedule }}" == "0 11 * * *" ]]; then + # at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo + additional_flags+=(--cmake_flag=-DFIRESTORE_DEP_SOURCE=TIP) + fi python scripts/gha/build_testapps.py --p Desktop \ --t ${{ needs.check_and_prepare.outputs.apis }} \ --output_directory "${{ github.workspace }}" \ @@ -335,13 +338,6 @@ jobs: --gha_build \ --arch ${{ matrix.arch }} \ ${additional_flags[*]} - - name: Upload Desktop Cmake - uses: actions/upload-artifact@v3 - if: ${{ !cancelled() }} - with: - name: cmake-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }} - path: D:/a/firebase-cpp-sdk/firebase-cpp-sdk/ta/firestore/iti/CMakeFiles/ - retention-days: 1 - name: Prepare results summary artifact if: ${{ !cancelled() }} shell: bash @@ -1370,7 +1366,7 @@ jobs: --run_id ${{github.run_id}} \ --new_token ${{steps.generate-token.outputs.token}} - name: Update Daily Report - # if: needs.check_and_prepare.outputs.trigger == 'scheduled_trigger' + if: needs.check_and_prepare.outputs.trigger == 'scheduled_trigger' shell: bash run: | if [[ "${{ github.event.inputs.test_pull_request }}" == "nightly-packaging" ]]; then @@ -1383,8 +1379,6 @@ jobs: additional_flags=(--build_against repo) fi fi - # test code. remove later. - additional_flags=(--build_against tip) if [[ "${{ needs.check_and_prepare.outputs.apis }}" == "firestore" ]]; then additional_flags+=(--build_apis firestore) else From 6c00fb02c2f6fe5798ce8162eeaf51365ffecc0c Mon Sep 17 00:00:00 2001 From: Mou Date: Mon, 12 Dec 2022 13:36:28 -0800 Subject: [PATCH 15/20] disable windows desktop test when test against ios main branch --- .github/workflows/integration_tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 0cde5de2a9..dfd0331efc 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -195,12 +195,14 @@ jobs: if [[ "${{ github.event.schedule }}" == "0 11 * * *" ]]; then # at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo matrix_platform="Desktop" + matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "ubuntu-20.04,macos-12") else matrix_platform=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k platform -o "${{github.event.inputs.platforms}}" --apis ${apis} ) + matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "${{github.event.inputs.operating_systems}}") fi echo "apis=${apis}" >> $GITHUB_OUTPUT echo "matrix_platform=${matrix_platform}" >> $GITHUB_OUTPUT - echo "matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "${{github.event.inputs.operating_systems}}")" >> $GITHUB_OUTPUT + echo "matrix_os=${matrix_os}" >> $GITHUB_OUTPUT echo "matrix_arch_macos=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k architecture_macos)" >> $GITHUB_OUTPUT echo "matrix_arch_windows_linux=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k architecture_windows_linux)" >> $GITHUB_OUTPUT # Combine architecture_macos and architecture_windows_linux to get a list of all architectures for the build matrix. From 4c8b4704ff387d59f371a81516c67a8bd9424856 Mon Sep 17 00:00:00 2001 From: Mou Date: Mon, 12 Dec 2022 13:40:33 -0800 Subject: [PATCH 16/20] update comment --- .github/workflows/integration_tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index dfd0331efc..a5b361e702 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -184,17 +184,17 @@ jobs: # To feed input into the job matrix, we first need to convert to a JSON # list. Then we can use fromJson to define the field in the matrix for the tests job. if [[ "${{ github.event.schedule }}" == "0 9 * * *" ]]; then - # at 1am PST/2am PDT. Running integration tests and generate test report for all testapps except firestore + # at 1am PST / 2am PDT. Run integration tests and generate test report for all testapps except firestore apis="admob,analytics,auth,database,dynamic_links,functions,gma,installations,messaging,remote_config,storage" elif [[ "${{ github.event.schedule }}" == "0 10 * * *" || "${{ github.event.schedule }}" == "0 11 * * *" ]]; then - # at 2am PST/3am PDT and 3am PST/4am PDT. Running integration tests for firestore and generate test report. + # at 2am PST / 3am PDT and 3am PST / 4am PDT. Run integration tests for firestore and generate test report. apis="firestore" else apis=$( python scripts/gha/print_matrix_configuration.py -c -w integration_tests -k apis -o "${{github.event.inputs.apis}}" ${TEST_MATRIX_PARAM} ) fi if [[ "${{ github.event.schedule }}" == "0 11 * * *" ]]; then - # at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo - matrix_platform="Desktop" + # at 3am PST / 4am PDT. Run firestore desktop integration test aginst tip-of-tree ios repo + matrix_platform=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k platform -o "Desktop" --apis ${apis} ) matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "ubuntu-20.04,macos-12") else matrix_platform=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k platform -o "${{github.event.inputs.platforms}}" --apis ${apis} ) @@ -328,7 +328,7 @@ jobs: fi fi if [[ "${{ github.event.schedule }}" == "0 11 * * *" ]]; then - # at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo + # at 3am PST / 4am PDT. Run firestore desktop integration test aginst tip-of-tree ios repo additional_flags+=(--cmake_flag=-DFIRESTORE_DEP_SOURCE=TIP) fi python scripts/gha/build_testapps.py --p Desktop \ @@ -1375,7 +1375,7 @@ jobs: additional_flags=(--build_against sdk) else if [[ "${{ github.event.schedule }}" == "0 11 * * *" ]]; then - # at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo + # at 3am PST / 4am PDT. Run firestore desktop integration test aginst tip-of-tree ios repo additional_flags=(--build_against tip) else additional_flags=(--build_against repo) From e5a4993750433ec9bdddafc7cf6c012ecf6e2257 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Wed, 14 Dec 2022 20:24:09 -0500 Subject: [PATCH 17/20] See if setting core.eol git config to lf fixes windows build errors. --- .github/workflows/android.yml | 6 ++++-- .github/workflows/desktop.yml | 6 ++++-- scripts/gha/install_test_workflow_prereqs.sh | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 23a3d330c7..2da556c6fe 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -62,9 +62,11 @@ jobs: git config --global credential.helper 'store --file /tmp/git-credentials' echo 'https://${{ github.token }}@github.com' > /tmp/git-credentials - - name: Enable Git Long-paths Support + - name: Enable Git Long-paths Support and LF line endings if: runner.os == 'Windows' - run: git config --system core.longpaths true + run: | + git config --system core.longpaths true + git config --global core.eol lf - name: Check expanded matrix config if: github.event.inputs.expanded_matrix == '1' diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index d294034dec..c1ff292c0b 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -102,9 +102,11 @@ jobs: git config --global credential.helper 'store --file /tmp/git-credentials' echo 'https://${{ github.token }}@github.com' > /tmp/git-credentials - - name: Enable Git Long-paths Support + - name: Enable Git Long-paths Support and LF line endings if: runner.os == 'Windows' - run: git config --system core.longpaths true + run: | + git config --system core.longpaths true + git config --global core.eol lf - name: Setup Xcode version (macos) if: runner.os == 'macOS' diff --git a/scripts/gha/install_test_workflow_prereqs.sh b/scripts/gha/install_test_workflow_prereqs.sh index ce994cfb80..44c89da662 100755 --- a/scripts/gha/install_test_workflow_prereqs.sh +++ b/scripts/gha/install_test_workflow_prereqs.sh @@ -52,6 +52,7 @@ echo 'https://${GITHUB_TOKEN}@github.com' > /tmp/git-credentials if [[ "${OS}" == "Windows" ]]; then git config --system core.longpaths true + git config --global core.eol lf fi if [[ "${OS}" == "Mac" ]]; then From 391d465ceaef20f490f430d19dfc1dd810d72d9d Mon Sep 17 00:00:00 2001 From: Mou Date: Thu, 15 Dec 2022 10:33:09 -0800 Subject: [PATCH 18/20] test against tip-of-tree --- .github/workflows/integration_tests.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index a5b361e702..1d05ccb3b1 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -327,10 +327,10 @@ jobs: additional_flags+=(--cmake_flag=-DFIREBASE_USE_BORINGSSL=ON) fi fi - if [[ "${{ github.event.schedule }}" == "0 11 * * *" ]]; then + # if [[ "${{ github.event.schedule }}" == "0 11 * * *" ]]; then # at 3am PST / 4am PDT. Run firestore desktop integration test aginst tip-of-tree ios repo additional_flags+=(--cmake_flag=-DFIRESTORE_DEP_SOURCE=TIP) - fi + # fi python scripts/gha/build_testapps.py --p Desktop \ --t ${{ needs.check_and_prepare.outputs.apis }} \ --output_directory "${{ github.workspace }}" \ @@ -340,6 +340,13 @@ jobs: --gha_build \ --arch ${{ matrix.arch }} \ ${additional_flags[*]} + - name: Upload Desktop Cmake + uses: actions/upload-artifact@v3 + if: ${{ !cancelled() }} + with: + name: cmake-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }} + path: D:/a/firebase-cpp-sdk/firebase-cpp-sdk/ta/firestore/iti/CMakeFiles/ + retention-days: 1 - name: Prepare results summary artifact if: ${{ !cancelled() }} shell: bash From da6e7cc52925879ff8e3d5a75f5fe24b5c367627 Mon Sep 17 00:00:00 2001 From: Mou Date: Fri, 16 Dec 2022 14:24:14 -0800 Subject: [PATCH 19/20] revert code --- .github/workflows/integration_tests.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 1d05ccb3b1..3ddaea0630 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -184,17 +184,17 @@ jobs: # To feed input into the job matrix, we first need to convert to a JSON # list. Then we can use fromJson to define the field in the matrix for the tests job. if [[ "${{ github.event.schedule }}" == "0 9 * * *" ]]; then - # at 1am PST / 2am PDT. Run integration tests and generate test report for all testapps except firestore + # at 1am PST/2am PDT. Running integration tests and generate test report for all testapps except firestore apis="admob,analytics,auth,database,dynamic_links,functions,gma,installations,messaging,remote_config,storage" elif [[ "${{ github.event.schedule }}" == "0 10 * * *" || "${{ github.event.schedule }}" == "0 11 * * *" ]]; then - # at 2am PST / 3am PDT and 3am PST / 4am PDT. Run integration tests for firestore and generate test report. + # at 2am PST/3am PDT and 3am PST/4am PDT. Running integration tests for firestore and generate test report. apis="firestore" else apis=$( python scripts/gha/print_matrix_configuration.py -c -w integration_tests -k apis -o "${{github.event.inputs.apis}}" ${TEST_MATRIX_PARAM} ) fi if [[ "${{ github.event.schedule }}" == "0 11 * * *" ]]; then - # at 3am PST / 4am PDT. Run firestore desktop integration test aginst tip-of-tree ios repo - matrix_platform=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k platform -o "Desktop" --apis ${apis} ) + # at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo + matrix_platform="Desktop" matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "ubuntu-20.04,macos-12") else matrix_platform=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k platform -o "${{github.event.inputs.platforms}}" --apis ${apis} ) @@ -327,10 +327,10 @@ jobs: additional_flags+=(--cmake_flag=-DFIREBASE_USE_BORINGSSL=ON) fi fi - # if [[ "${{ github.event.schedule }}" == "0 11 * * *" ]]; then - # at 3am PST / 4am PDT. Run firestore desktop integration test aginst tip-of-tree ios repo + if [[ "${{ github.event.schedule }}" == "0 11 * * *" ]]; then + # at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo additional_flags+=(--cmake_flag=-DFIRESTORE_DEP_SOURCE=TIP) - # fi + fi python scripts/gha/build_testapps.py --p Desktop \ --t ${{ needs.check_and_prepare.outputs.apis }} \ --output_directory "${{ github.workspace }}" \ @@ -1382,7 +1382,7 @@ jobs: additional_flags=(--build_against sdk) else if [[ "${{ github.event.schedule }}" == "0 11 * * *" ]]; then - # at 3am PST / 4am PDT. Run firestore desktop integration test aginst tip-of-tree ios repo + # at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo additional_flags=(--build_against tip) else additional_flags=(--build_against repo) From ec7684638690f9fa81d0bfe4f76ca369aced33ac Mon Sep 17 00:00:00 2001 From: Mou Date: Fri, 16 Dec 2022 14:25:22 -0800 Subject: [PATCH 20/20] Revert "See if setting core.eol git config to lf fixes windows build errors." This reverts commit e5a4993750433ec9bdddafc7cf6c012ecf6e2257. --- .github/workflows/android.yml | 6 ++---- .github/workflows/desktop.yml | 6 ++---- scripts/gha/install_test_workflow_prereqs.sh | 1 - 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 2da556c6fe..23a3d330c7 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -62,11 +62,9 @@ jobs: git config --global credential.helper 'store --file /tmp/git-credentials' echo 'https://${{ github.token }}@github.com' > /tmp/git-credentials - - name: Enable Git Long-paths Support and LF line endings + - name: Enable Git Long-paths Support if: runner.os == 'Windows' - run: | - git config --system core.longpaths true - git config --global core.eol lf + run: git config --system core.longpaths true - name: Check expanded matrix config if: github.event.inputs.expanded_matrix == '1' diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index c1ff292c0b..d294034dec 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -102,11 +102,9 @@ jobs: git config --global credential.helper 'store --file /tmp/git-credentials' echo 'https://${{ github.token }}@github.com' > /tmp/git-credentials - - name: Enable Git Long-paths Support and LF line endings + - name: Enable Git Long-paths Support if: runner.os == 'Windows' - run: | - git config --system core.longpaths true - git config --global core.eol lf + run: git config --system core.longpaths true - name: Setup Xcode version (macos) if: runner.os == 'macOS' diff --git a/scripts/gha/install_test_workflow_prereqs.sh b/scripts/gha/install_test_workflow_prereqs.sh index 44c89da662..ce994cfb80 100755 --- a/scripts/gha/install_test_workflow_prereqs.sh +++ b/scripts/gha/install_test_workflow_prereqs.sh @@ -52,7 +52,6 @@ echo 'https://${GITHUB_TOKEN}@github.com' > /tmp/git-credentials if [[ "${OS}" == "Windows" ]]; then git config --system core.longpaths true - git config --global core.eol lf fi if [[ "${OS}" == "Mac" ]]; then