Skip to content

Commit 442b37a

Browse files
Add comments and check runner.os instead of matrix.os
1 parent 398e773 commit 442b37a

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.github/workflows/cpp-packaging.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ jobs:
650650
with:
651651
python-version: '3.7'
652652
- name: Add msbuild to PATH (windows)
653-
if: startsWith(matrix.os, 'windows')
653+
if: runner.os == 'Windows'
654654
uses: microsoft/[email protected]
655655
- name: Prepare for integration tests
656656
run: |
@@ -663,7 +663,7 @@ jobs:
663663
# Workaround for https://github.com/GoogleCloudPlatform/github-actions/issues/100
664664
# Must be run after the Python setup action
665665
- name: Set CLOUDSDK_PYTHON (Windows)
666-
if: startsWith(matrix.os, 'windows') && !cancelled()
666+
if: runner.os == 'Windows' && !cancelled()
667667
run: echo "CLOUDSDK_PYTHON=${{env.pythonLocation}}\python.exe" >> $GITHUB_ENV
668668
- name: Install Cloud SDK
669669
if: ${{ !cancelled() }}

scripts/gha/build_testapps.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ def _validate_android_environment_variables():
399399
# If sdk_dir contains no framework, consider it is Github repo, then
400400
# generate makefiles for ios frameworks
401401
def _generate_makefiles_from_repo(sdk_dir):
402+
"""Generates cmake makefiles for building iOS frameworks from SDK source."""
402403
ios_framework_builder = os.path.join(
403404
sdk_dir, "build_scripts", "ios", "build.sh")
404405

@@ -413,12 +414,15 @@ def _generate_makefiles_from_repo(sdk_dir):
413414

414415
# build required ios frameworks based on makefiles
415416
def _build_ios_framework_from_repo(sdk_dir, api_config):
417+
"""Builds iOS framework from SDK source."""
416418
ios_framework_builder = os.path.join(
417419
sdk_dir, "build_scripts", "ios", "build.sh")
418420

419421
# build only required targets to save time
420422
target = set()
423+
421424
for framework in api_config.frameworks:
425+
# firebase_analytics.framework -> firebase_analytics
422426
target.add(os.path.splitext(framework)[0])
423427
# firebase is not a target in CMake, firebase_app is the target
424428
# firebase_app will be built by other target as well

0 commit comments

Comments
 (0)