Skip to content

Commit 0fc0923

Browse files
authored
infra: Fix firebaseai job in zip.yml (#15574)
1 parent 45210bd commit 0fc0923

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

.github/workflows/zip.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,7 @@ jobs:
357357
env:
358358
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
359359
SDK: "FirebaseAI"
360-
# This is a workaround to use the FirebaseAIExampleZip scheme that does not have the SPM dependency.
361-
SWIFT_SUFFIX: "Zip"
360+
SWIFT_SUFFIX: " (iOS)"
362361
strategy:
363362
matrix:
364363
artifact: [Firebase-actions-dir, Firebase-actions-dir-dynamic]
@@ -385,7 +384,7 @@ jobs:
385384
find "${GITHUB_WORKSPACE}" -name "Firebase*latest.zip" -exec unzip -d "${HOME}"/ios_frameworks/ {} +
386385
- uses: actions/checkout@v4
387386
- name: Setup quickstart
388-
run: SAMPLE="$SDK" TARGET="${SDK}ExampleZip" scripts/setup_quickstart_framework.sh \
387+
run: SAMPLE="$SDK" TARGET="${SDK}Example" scripts/setup_quickstart_framework.sh \
389388
"${HOME}"/ios_frameworks/Firebase/FirebaseAILogic/* \
390389
"${HOME}"/ios_frameworks/Firebase/FirebaseAnalytics/*
391390
- name: Install Secret GoogleService-Info.plist

scripts/test_quickstart_framework.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,5 @@ source scripts/check_secrets.sh
3030

3131
if check_secrets; then
3232
cd quickstart-ios
33-
if [ "$platform" = "swift" ]; then
34-
have_secrets=true SAMPLE="$sample" SWIFT_SUFFIX="Swift" "${REPO}"/scripts/zip_quickstart_test.sh
35-
else
36-
have_secrets=true SAMPLE="$sample" "${REPO}"/scripts/zip_quickstart_test.sh
37-
fi
33+
have_secrets=true SAMPLE="$sample" "${REPO}"/scripts/zip_quickstart_test.sh
3834
fi

scripts/zip_quickstart_test.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ EXIT_STATUS=0
2626

2727
cd "${SAMPLE}"
2828

29-
if [[ ! -z "$LEGACY" ]]; then
30-
cd "Legacy${SAMPLE}Quickstart"
31-
fi
32-
3329
xcode_version=$(xcodebuild -version | grep Xcode)
3430
xcode_version="${xcode_version/Xcode /}"
3531
xcode_major="${xcode_version/.*/}"
@@ -58,7 +54,7 @@ fi
5854
(
5955
xcodebuild \
6056
-project ${PROJECT_NAME} \
61-
-scheme ${SCHEME_NAME} \
57+
-scheme "${SCHEME_NAME}" \
6258
-destination "platform=iOS Simulator,name=$device_name" "SWIFT_VERSION=5.3" "OTHER_LDFLAGS=\$(OTHER_LDFLAGS) -ObjC" "FRAMEWORK_SEARCH_PATHS= \$(PROJECT_DIR)/Firebase/" HEADER_SEARCH_PATHS='$(inherited) $(PROJECT_DIR)/Firebase' \
6359
build \
6460
) || EXIT_STATUS=$?

0 commit comments

Comments
 (0)