diff --git a/.github/workflows/zip.yml b/.github/workflows/zip.yml index 3a79a940d1e..49950de3eec 100644 --- a/.github/workflows/zip.yml +++ b/.github/workflows/zip.yml @@ -9,6 +9,8 @@ # zip from the current commit (HEAD). name: zip +# TODO(ncooke3): Also do Xcode 26 testing + permissions: actions: read contents: read @@ -363,7 +365,7 @@ jobs: artifact: [Firebase-actions-dir, Firebase-actions-dir-dynamic] build-env: - os: macos-15 - xcode: Xcode_16.4 + xcode: Xcode_26.1 runs-on: ${{ matrix.build-env.os }} steps: - uses: actions/checkout@v4 diff --git a/scripts/setup_quickstart_framework.sh b/scripts/setup_quickstart_framework.sh index d500666ae4f..6c4e14eaf0a 100755 --- a/scripts/setup_quickstart_framework.sh +++ b/scripts/setup_quickstart_framework.sh @@ -25,7 +25,7 @@ cd quickstart-ios/"${SAMPLE}" # the project for framework-based testing. if [[ "${SAMPLE}" == "FirebaseAI" ]]; then # For the FirebaseAI quickstart, we only want to remove the Firebase deps. - "${REPO}"/scripts/remove_spm_dependencies.rb "${SAMPLE}Example.xcodeproj" FirebaseAI + "${REPO}"/scripts/remove_spm_dependencies.rb "${SAMPLE}Example.xcodeproj" FirebaseAILogic else # For other quickstarts, remove all SPM dependencies. "${REPO}"/scripts/remove_spm_dependencies.rb "${SAMPLE}Example.xcodeproj"