From 873a133ec2b5cab091db55448a89845ad5bebef4 Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Mon, 23 Oct 2023 13:22:42 -0400 Subject: [PATCH 01/21] Update build workflow --- .github/workflows/bcny-firebase.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index 37f33a10c7..a5d3994b11 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -36,8 +36,16 @@ jobs: python-version: 3.9 architecture: 'x64' - - name: Install absl-py - run: pip install absl-py + - name: Install Desktop SDK prerequisites + uses: nick-invision/retry@v2 + with: + timeout_minutes: 15 + max_attempts: 3 + command: | + python scripts/gha/install_prereqs_desktop.py --gha_build --arch 'x64' + + # - name: Install absl-py + # run: pip install absl-py - name: Configure firebase run: From 6cd9d06329bde279422a44488bd1416f2f0d3de4 Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Mon, 23 Oct 2023 13:36:58 -0400 Subject: [PATCH 02/21] Fix paths --- .github/workflows/bcny-firebase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index a5d3994b11..f5b6051836 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -42,7 +42,7 @@ jobs: timeout_minutes: 15 max_attempts: 3 command: | - python scripts/gha/install_prereqs_desktop.py --gha_build --arch 'x64' + python ${{ github.workspace }}/SourceCache/firebase-cpp-sdk/scripts/gha/install_prereqs_desktop.py --gha_build --arch 'x64' # - name: Install absl-py # run: pip install absl-py From 9835e466f17dc46b9f834711d0cbabdcf86cfca3 Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Mon, 23 Oct 2023 13:51:29 -0400 Subject: [PATCH 03/21] See if our checkout paths make a difference --- .github/workflows/bcny-firebase.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index f5b6051836..159cbea5b1 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -19,8 +19,7 @@ jobs: steps: - uses: actions/checkout@v3 with: - fetch-depth: 1 - path: ${{ github.workspace }}/SourceCache/firebase-cpp-sdk + submodules: true ref: refs/heads/compnerd/swift repository: thebrowsercompany/firebase-cpp-sdk @@ -42,7 +41,7 @@ jobs: timeout_minutes: 15 max_attempts: 3 command: | - python ${{ github.workspace }}/SourceCache/firebase-cpp-sdk/scripts/gha/install_prereqs_desktop.py --gha_build --arch 'x64' + python scripts/gha/install_prereqs_desktop.py --gha_build --arch 'x64' # - name: Install absl-py # run: pip install absl-py @@ -55,7 +54,7 @@ jobs: -D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/firebase/usr ` -G "Visual Studio 17 2022" ` -A ${{ matrix.platform }} ` - -S ${{ github.workspace }}/SourceCache/firebase-cpp-sdk ` + -S . ` -D FIREBASE_CPP_BUILD_PACKAGE=YES ` -D FIREBASE_GITHUB_ACTION_BUILD=YES ` -D FIREBASE_INCLUDE_LIBRARY_DEFAULT=OFF ` From 564a80beeb9bd3b9689f9ff9ff86ef8d40e11aef Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Mon, 23 Oct 2023 14:58:14 -0400 Subject: [PATCH 04/21] Try to get closer to upstream --- .github/workflows/bcny-firebase.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index 159cbea5b1..e53f26bbc7 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/setup-python@v4 id: python with: - python-version: 3.9 + python-version: 3.7 architecture: 'x64' - name: Install Desktop SDK prerequisites @@ -62,7 +62,6 @@ jobs: -D FIREBASE_INCLUDE_FIRESTORE=YES ` -D FIREBASE_USE_BORINGSSL=YES ` -D MSVC_RUNTIME_LIBRARY_STATIC=NO ` - -D Python3_EXECUTABLE=${{ steps.python.outputs.python-path }} - name: Build firebase run: cmake --build ${{ github.workspace }}/BinaryCache/firebase --config Release - name: Install firebase From 77de34e1295dd0f92d941b105cae4a840c3c57f0 Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Mon, 23 Oct 2023 15:07:46 -0400 Subject: [PATCH 05/21] Fix path --- .github/workflows/bcny-firebase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index e53f26bbc7..aad50c00c9 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -54,7 +54,7 @@ jobs: -D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/firebase/usr ` -G "Visual Studio 17 2022" ` -A ${{ matrix.platform }} ` - -S . ` + -S ${{ github.workspace }} ` -D FIREBASE_CPP_BUILD_PACKAGE=YES ` -D FIREBASE_GITHUB_ACTION_BUILD=YES ` -D FIREBASE_INCLUDE_LIBRARY_DEFAULT=OFF ` From 1d838b90e3cbb961e22616411404d283bd58bf56 Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Mon, 23 Oct 2023 15:31:24 -0400 Subject: [PATCH 06/21] Fix platform --- .github/workflows/bcny-firebase.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index aad50c00c9..2d5426c00c 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -41,10 +41,7 @@ jobs: timeout_minutes: 15 max_attempts: 3 command: | - python scripts/gha/install_prereqs_desktop.py --gha_build --arch 'x64' - - # - name: Install absl-py - # run: pip install absl-py + python scripts/gha/install_prereqs_desktop.py --gha_build --arch ${{ matrix.platform }} - name: Configure firebase run: From c8ec4fbf7cf6a86ffc06c5ca8080b6d33ca34b3b Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Mon, 23 Oct 2023 15:42:22 -0400 Subject: [PATCH 07/21] Debug with dir --- .github/workflows/bcny-firebase.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index 2d5426c00c..a136de238b 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -45,7 +45,7 @@ jobs: - name: Configure firebase run: - cmake -B ${{ github.workspace }}/BinaryCache/firebase ` + cmake -B ${{ github.workspace }}\\BinaryCache\\firebase ` -D BUILD_SHARED_LIBS=NO ` -D CMAKE_BUILD_TYPE=Release ` -D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/firebase/usr ` @@ -59,6 +59,9 @@ jobs: -D FIREBASE_INCLUDE_FIRESTORE=YES ` -D FIREBASE_USE_BORINGSSL=YES ` -D MSVC_RUNTIME_LIBRARY_STATIC=NO ` + + - name: List structure + run: dir . - name: Build firebase run: cmake --build ${{ github.workspace }}/BinaryCache/firebase --config Release - name: Install firebase From 3cb934a52792601f445091110fdd0e5447551fa3 Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Mon, 23 Oct 2023 15:51:34 -0400 Subject: [PATCH 08/21] Go back to mostly what we used to have --- .github/workflows/bcny-firebase.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index a136de238b..0e67c8eaab 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -19,7 +19,8 @@ jobs: steps: - uses: actions/checkout@v3 with: - submodules: true + fetch-depth: 1 + path: ${{ github.workspace }}/SourceCache/firebase-cpp-sdk ref: refs/heads/compnerd/swift repository: thebrowsercompany/firebase-cpp-sdk @@ -35,23 +36,26 @@ jobs: python-version: 3.7 architecture: 'x64' - - name: Install Desktop SDK prerequisites - uses: nick-invision/retry@v2 - with: - timeout_minutes: 15 - max_attempts: 3 - command: | - python scripts/gha/install_prereqs_desktop.py --gha_build --arch ${{ matrix.platform }} + - name: Install absl-py + run: pip install absl-py + + # - name: Install Desktop SDK prerequisites + # uses: nick-invision/retry@v2 + # with: + # timeout_minutes: 15 + # max_attempts: 3 + # command: | + # python scripts/gha/install_prereqs_desktop.py --gha_build --arch ${{ matrix.platform }} - name: Configure firebase run: - cmake -B ${{ github.workspace }}\\BinaryCache\\firebase ` + cmake -B ${{ github.workspace }}/BinaryCache/firebase ` -D BUILD_SHARED_LIBS=NO ` -D CMAKE_BUILD_TYPE=Release ` -D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/firebase/usr ` -G "Visual Studio 17 2022" ` -A ${{ matrix.platform }} ` - -S ${{ github.workspace }} ` + -S ${{ github.workspace }}/SourceCache/firebase-cpp-sdk ` -D FIREBASE_CPP_BUILD_PACKAGE=YES ` -D FIREBASE_GITHUB_ACTION_BUILD=YES ` -D FIREBASE_INCLUDE_LIBRARY_DEFAULT=OFF ` From baee60559286167e2ab6fb8667a67ea142a12f94 Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Mon, 23 Oct 2023 15:59:34 -0400 Subject: [PATCH 09/21] Remove trailing back tick --- .github/workflows/bcny-firebase.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index 0e67c8eaab..aa07469088 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -39,14 +39,6 @@ jobs: - name: Install absl-py run: pip install absl-py - # - name: Install Desktop SDK prerequisites - # uses: nick-invision/retry@v2 - # with: - # timeout_minutes: 15 - # max_attempts: 3 - # command: | - # python scripts/gha/install_prereqs_desktop.py --gha_build --arch ${{ matrix.platform }} - - name: Configure firebase run: cmake -B ${{ github.workspace }}/BinaryCache/firebase ` @@ -62,7 +54,7 @@ jobs: -D FIREBASE_INCLUDE_AUTH=YES ` -D FIREBASE_INCLUDE_FIRESTORE=YES ` -D FIREBASE_USE_BORINGSSL=YES ` - -D MSVC_RUNTIME_LIBRARY_STATIC=NO ` + -D MSVC_RUNTIME_LIBRARY_STATIC=NO - name: List structure run: dir . From 1e491b3c376ce3be4d8256bd5922bd36eaa1b53b Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Mon, 23 Oct 2023 16:12:02 -0400 Subject: [PATCH 10/21] Pull over the deletion of Strawberry from the upstream script --- .github/workflows/bcny-firebase.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index aa07469088..6639abbcff 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -39,6 +39,9 @@ jobs: - name: Install absl-py run: pip install absl-py + - name: Remove Strawberry + run: "rm -r C:\\Strawberry" + - name: Configure firebase run: cmake -B ${{ github.workspace }}/BinaryCache/firebase ` From 22cee84e4737f11a615189574eb57e3a00d31e8d Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Wed, 8 Nov 2023 12:01:31 +0000 Subject: [PATCH 11/21] Use python setup --- .github/workflows/bcny-firebase.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index 6639abbcff..22120ebbeb 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -36,8 +36,9 @@ jobs: python-version: 3.7 architecture: 'x64' - - name: Install absl-py - run: pip install absl-py + - name: Run Python Setup + run: | + python3 -m pip install -r ${{ github.workspace }}/SourceCache/firebase-cpp-sdk/external/pip_requirements.txt --user - name: Remove Strawberry run: "rm -r C:\\Strawberry" From 65fab373b576640fc22f3dd4835b132a9d827bf2 Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Wed, 8 Nov 2023 18:32:07 +0000 Subject: [PATCH 12/21] Go more towards upstream --- .github/workflows/bcny-firebase.yml | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index 22120ebbeb..d008dae4cb 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -19,8 +19,6 @@ jobs: steps: - uses: actions/checkout@v3 with: - fetch-depth: 1 - path: ${{ github.workspace }}/SourceCache/firebase-cpp-sdk ref: refs/heads/compnerd/swift repository: thebrowsercompany/firebase-cpp-sdk @@ -38,27 +36,14 @@ jobs: - name: Run Python Setup run: | - python3 -m pip install -r ${{ github.workspace }}/SourceCache/firebase-cpp-sdk/external/pip_requirements.txt --user + python3 -m pip install -r .\external\pip_requirements.txt --user - name: Remove Strawberry run: "rm -r C:\\Strawberry" - - name: Configure firebase + - name: Build SDK run: - cmake -B ${{ github.workspace }}/BinaryCache/firebase ` - -D BUILD_SHARED_LIBS=NO ` - -D CMAKE_BUILD_TYPE=Release ` - -D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/firebase/usr ` - -G "Visual Studio 17 2022" ` - -A ${{ matrix.platform }} ` - -S ${{ github.workspace }}/SourceCache/firebase-cpp-sdk ` - -D FIREBASE_CPP_BUILD_PACKAGE=YES ` - -D FIREBASE_GITHUB_ACTION_BUILD=YES ` - -D FIREBASE_INCLUDE_LIBRARY_DEFAULT=OFF ` - -D FIREBASE_INCLUDE_AUTH=YES ` - -D FIREBASE_INCLUDE_FIRESTORE=YES ` - -D FIREBASE_USE_BORINGSSL=YES ` - -D MSVC_RUNTIME_LIBRARY_STATIC=NO + puthon3 .\scripts\gha\build_desktop.py --arch "${{ matrix.arch }}" --config "Release" --msvc_runtime_library "dynamic" --gha_build - name: List structure run: dir . From 38175586ce508ca13b9f34570f5a515f7fb2e8cc Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Wed, 8 Nov 2023 18:35:09 +0000 Subject: [PATCH 13/21] Fix typo --- .github/workflows/bcny-firebase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index d008dae4cb..13b93e59b6 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -43,7 +43,7 @@ jobs: - name: Build SDK run: - puthon3 .\scripts\gha\build_desktop.py --arch "${{ matrix.arch }}" --config "Release" --msvc_runtime_library "dynamic" --gha_build + python3 .\scripts\gha\build_desktop.py --arch "${{ matrix.arch }}" --config "Release" --msvc_runtime_library "dynamic" --gha_build - name: List structure run: dir . From bf6526dc1697d69a3f1a5e55dfa0cc0848bb03c0 Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Wed, 8 Nov 2023 18:55:59 +0000 Subject: [PATCH 14/21] Use desktop prereq script --- .github/workflows/bcny-firebase.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index 13b93e59b6..18c78f4e50 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -22,24 +22,19 @@ jobs: ref: refs/heads/compnerd/swift repository: thebrowsercompany/firebase-cpp-sdk - - uses: compnerd/gha-setup-vsdevenv@main - with: - host_arch: amd64 - components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64' - arch: ${{ matrix.arch }} - - uses: actions/setup-python@v4 id: python with: python-version: 3.7 architecture: 'x64' - - name: Run Python Setup - run: | - python3 -m pip install -r .\external\pip_requirements.txt --user - - - name: Remove Strawberry - run: "rm -r C:\\Strawberry" + - name: Install Desktop SDK prerequisites + uses: nick-invision/retry@v2 + with: + timeout_minutes: 15 + max_attempts: 3 + command: | + python scripts/gha/install_prereqs_desktop.py --gha_build --arch '${{ matrix.arch }}' - name: Build SDK run: From c18a7ab2cfce7f406de3e83ee0664c8b4a63f268 Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Wed, 8 Nov 2023 19:07:19 +0000 Subject: [PATCH 15/21] Access a github token --- .github/workflows/bcny-firebase.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index 18c78f4e50..28d569f05b 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -3,6 +3,9 @@ name: firebase on: workflow_dispatch: +env: + GITHUB_TOKEN: ${{ github.token }} + jobs: windows: runs-on: windows-latest From cb5c00ef9260003db90ce76f68ff03a171dfadc0 Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Wed, 8 Nov 2023 19:15:59 +0000 Subject: [PATCH 16/21] Intentionally pass invalid value like upstream --- .github/workflows/bcny-firebase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index 28d569f05b..2561f40c69 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/setup-python@v4 id: python with: - python-version: 3.7 + python-version: ${{ matrix.intentionally_broken_like_upstream }} architecture: 'x64' - name: Install Desktop SDK prerequisites From d1628da1464ea1aab4d9024d6e5ec2fa9cd79605 Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Wed, 8 Nov 2023 21:12:32 +0000 Subject: [PATCH 17/21] Create directory to copy build output into --- .github/workflows/bcny-firebase.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index 2561f40c69..38141fbdac 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -41,22 +41,23 @@ jobs: - name: Build SDK run: - python3 .\scripts\gha\build_desktop.py --arch "${{ matrix.arch }}" --config "Release" --msvc_runtime_library "dynamic" --gha_build + python3 .\scripts\gha\build_desktop.py ` + --arch "${{ matrix.arch }}" ` + --config "Release" ` + --msvc_runtime_library "dynamic" ` + --target firebase_app firebase_auth firebase_firestore ` + --gha_build ` - - name: List structure - run: dir . - - name: Build firebase - run: cmake --build ${{ github.workspace }}/BinaryCache/firebase --config Release - - name: Install firebase - run: cmake --build ${{ github.workspace }}/BinaryCache/firebase --config Release --target install - name: Install firebase (manual) run: | - Copy-Item "${{ github.workspace }}/BinaryCache/firebase/external/src/firestore/Firestore/core/include/firebase/firestore/firestore_errors.h" "${{ github.workspace }}/BuildRoot/Library/firebase/usr/include/firebase/firestore/firestore_errors.h" - Copy-Item "${{ github.workspace }}/BinaryCache/firebase/external/src/firestore/Firestore/core/include/firebase/firestore/geo_point.h" "${{ github.workspace }}/BuildRoot/Library/firebase/usr/include/firebase/firestore/geo_point.h" - Copy-Item "${{ github.workspace }}/BinaryCache/firebase/external/src/firestore/Firestore/core/include/firebase/firestore/timestamp.h" "${{ github.workspace }}/BuildRoot/Library/firebase/usr/include/firebase/firestore/timestamp.h" + New-Item -ItemType Directory -Path ${{ github.workspace }}/BuildRoot/Library/firebase/usr + + Copy-Item "${{ github.workspace }}/build/external/src/firestore/Firestore/core/include/firebase/firestore/firestore_errors.h" "${{ github.workspace }}/BuildRoot/Library/firebase/usr/include/firebase/firestore/firestore_errors.h" + Copy-Item "${{ github.workspace }}/build/external/src/firestore/Firestore/core/include/firebase/firestore/geo_point.h" "${{ github.workspace }}/BuildRoot/Library/firebase/usr/include/firebase/firestore/geo_point.h" + Copy-Item "${{ github.workspace }}/build/external/src/firestore/Firestore/core/include/firebase/firestore/timestamp.h" "${{ github.workspace }}/BuildRoot/Library/firebase/usr/include/firebase/firestore/timestamp.h" Write-Host "Copying static libraries ..." - $source = "${{ github.workspace }}/BinaryCache/firebase" + $source = "${{ github.workspace }}/build" $libraries = Get-ChildItem -Path $source -File -Recurse -Filter *.lib foreach ($library in $libraries) { $destination = Join-Path -Path "${{ github.workspace }}/BuildRoot/Library/firebase/usr/libs/windows" -ChildPath $library.Name From dda2f59645f2b75cfcda25ce68af0e17b7fa9e56 Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Wed, 8 Nov 2023 22:20:57 +0000 Subject: [PATCH 18/21] setup ngrok session to debug install paths --- .github/workflows/bcny-firebase.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index 38141fbdac..952306a55a 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -48,6 +48,12 @@ jobs: --target firebase_app firebase_auth firebase_firestore ` --gha_build ` + - name: Start SSH session + uses: luchihoratiu/debug-via-ssh@main + with: + NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }} + SSH_PASS: ${{ secrets.SSH_PASS }} + - name: Install firebase (manual) run: | New-Item -ItemType Directory -Path ${{ github.workspace }}/BuildRoot/Library/firebase/usr From 2bef2c3447d09c52289a6a6aca8bbe3f3851c774 Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Wed, 8 Nov 2023 22:22:50 +0000 Subject: [PATCH 19/21] Remove multiline command temporarily --- .github/workflows/bcny-firebase.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index 952306a55a..ba5909016a 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -41,12 +41,7 @@ jobs: - name: Build SDK run: - python3 .\scripts\gha\build_desktop.py ` - --arch "${{ matrix.arch }}" ` - --config "Release" ` - --msvc_runtime_library "dynamic" ` - --target firebase_app firebase_auth firebase_firestore ` - --gha_build ` + python3 .\scripts\gha\build_desktop.py --arch "${{ matrix.arch }}" --config "Release" --msvc_runtime_library "dynamic" --target firebase_app firebase_auth firebase_firestore --gha_build - name: Start SSH session uses: luchihoratiu/debug-via-ssh@main From 9213e72d6b25ccfcf4022de1c947e2d0d5e4db80 Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Wed, 8 Nov 2023 23:44:55 +0000 Subject: [PATCH 20/21] Fix typos --- .github/workflows/bcny-firebase.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index ba5909016a..6c89b268df 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -43,15 +43,10 @@ jobs: run: python3 .\scripts\gha\build_desktop.py --arch "${{ matrix.arch }}" --config "Release" --msvc_runtime_library "dynamic" --target firebase_app firebase_auth firebase_firestore --gha_build - - name: Start SSH session - uses: luchihoratiu/debug-via-ssh@main - with: - NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }} - SSH_PASS: ${{ secrets.SSH_PASS }} - - name: Install firebase (manual) run: | - New-Item -ItemType Directory -Path ${{ github.workspace }}/BuildRoot/Library/firebase/usr + New-Item -ItemType Directory -Path ${{ github.workspace }}/BuildRoot/Library/firebase/usr/include/firebase/firestore + New-Item -ItemType Directory -Path ${{ github.workspace }}/BuildRoot/Library/firebase/usr/libs/windows Copy-Item "${{ github.workspace }}/build/external/src/firestore/Firestore/core/include/firebase/firestore/firestore_errors.h" "${{ github.workspace }}/BuildRoot/Library/firebase/usr/include/firebase/firestore/firestore_errors.h" Copy-Item "${{ github.workspace }}/build/external/src/firestore/Firestore/core/include/firebase/firestore/geo_point.h" "${{ github.workspace }}/BuildRoot/Library/firebase/usr/include/firebase/firestore/geo_point.h" From be2288c86c2e73228478cb4780edf5ac4d1c77b5 Mon Sep 17 00:00:00 2001 From: Brian Michel Date: Thu, 9 Nov 2023 10:47:50 +0000 Subject: [PATCH 21/21] Make builds verbose and fix slashes --- .github/workflows/bcny-firebase.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml index 6c89b268df..f14b0778d2 100644 --- a/.github/workflows/bcny-firebase.yml +++ b/.github/workflows/bcny-firebase.yml @@ -37,11 +37,14 @@ jobs: timeout_minutes: 15 max_attempts: 3 command: | - python scripts/gha/install_prereqs_desktop.py --gha_build --arch '${{ matrix.arch }}' + python3 scripts/gha/install_prereqs_desktop.py --gha_build --arch '${{ matrix.arch }}' - name: Build SDK run: - python3 .\scripts\gha\build_desktop.py --arch "${{ matrix.arch }}" --config "Release" --msvc_runtime_library "dynamic" --target firebase_app firebase_auth firebase_firestore --gha_build + python3 scripts/gha/build_desktop.py --arch "${{ matrix.arch }}" --config "Release" --msvc_runtime_library "dynamic" --target firebase_app firebase_auth firebase_firestore --gha_build --verbose + + - name: Install firebase + run: cmake --build ${{ github.workspace }}/build --config Release --target install - name: Install firebase (manual) run: |