Skip to content

Commit 83d40eb

Browse files
authored
[Infra] Fix auto-tagging in release_testing_setup.sh for prerelease.yml (#13427)
1 parent 7f845f4 commit 83d40eb

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

.github/workflows/prerelease.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ jobs:
2020
runs-on: macos-14
2121
env:
2222
bot_token_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
23-
# The SDK repo will be cloned to this dir and podspecs from
24-
# 'podspec_repo_branch' of this repo will be validated and pushed to the
25-
# testing repo.
26-
local_sdk_repo_dir: /tmp/test/firebase-ios-sdk
2723
local_repo: specstesting
2824
podspec_repo_branch: main
2925
outputs:
@@ -41,7 +37,6 @@ jobs:
4137
run: |
4238
test_version="${nightly_version}" \
4339
sdk_version_config="${GITHUB_WORKSPACE}/scripts/create_spec_repo/RC_firebase_sdk.textproto" \
44-
local_sdk_repo_dir="${local_sdk_repo_dir}" \
4540
podspec_repo_branch="${podspec_repo_branch}" \
4641
scripts/release_testing_setup.sh prerelease_testing
4742
env:
@@ -69,8 +64,8 @@ jobs:
6964
with:
7065
name: firebase-ios-sdk
7166
path: |
72-
${{ env.local_sdk_repo_dir }}/*.podspec
73-
${{ env.local_sdk_repo_dir }}/*.podspec.json
67+
*.podspec
68+
*.podspec.json
7469
buildup_SpecsTesting_repo_FirebaseCore:
7570
needs: specs_checking
7671
# Don't run on private repo unless it is a PR.
@@ -163,7 +158,6 @@ jobs:
163158
env:
164159
bot_token_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
165160
local_repo: specstesting
166-
local_sdk_repo_dir: /tmp/test/firebase-ios-sdk
167161
podspec_repo_branch: main
168162
steps:
169163
- uses: actions/checkout@v4
@@ -176,15 +170,13 @@ jobs:
176170
# Update/create a nightly tag to the head of the main branch.
177171
test_version="${nightly_version}" \
178172
sdk_version_config="${GITHUB_WORKSPACE}/scripts/create_spec_repo/RC_firebase_sdk.textproto" \
179-
local_sdk_repo_dir="${local_sdk_repo_dir}" \
180173
podspec_repo_branch="${podspec_repo_branch}" \
181174
scripts/release_testing_setup.sh prerelease_testing
182175
env:
183176
BOT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
184177
- name: Push updated podspecs
185178
run: |
186179
botaccess=`cat bot-access.txt`
187-
cd "${local_sdk_repo_dir}"
188180
# Changes in post submit tests will be fetched by getting diff between
189181
# the HEAD and HEAD^ of the main branch.
190182
common_commit=$(git rev-parse HEAD^)
@@ -205,7 +197,7 @@ jobs:
205197
cd scripts/create_spec_repo/
206198
swift build
207199
pod repo add --silent "${local_repo}" https://"$botaccess"@github.com/Firebase/SpecsTesting.git
208-
BOT_TOKEN="${botaccess}" .build/debug/spec-repo-builder --sdk-repo "${local_sdk_repo_dir}" --local-spec-repo-name "${local_repo}" --sdk-repo-name SpecsTesting --github-account Firebase --pod-sources 'https://${BOT_TOKEN}@github.com/Firebase/SpecsTesting' "https://github.com/firebase/SpecsDev.git" "https://github.com/firebase/SpecsStaging.git" "https://cdn.cocoapods.org/" "FirebaseFirestoreTestingSupport" "FirebaseAuthTestingSupport" "FirebaseCombineSwift" --keep-repo --include-pods "${updated_podspecs[@]}"
200+
BOT_TOKEN="${botaccess}" .build/debug/spec-repo-builder --sdk-repo $(pwd) --local-spec-repo-name "${local_repo}" --sdk-repo-name SpecsTesting --github-account Firebase --pod-sources 'https://${BOT_TOKEN}@github.com/Firebase/SpecsTesting' "https://github.com/firebase/SpecsDev.git" "https://github.com/firebase/SpecsStaging.git" "https://cdn.cocoapods.org/" "FirebaseFirestoreTestingSupport" "FirebaseAuthTestingSupport" "FirebaseCombineSwift" --keep-repo --include-pods "${updated_podspecs[@]}"
209201
210202
abtesting_quickstart:
211203
# Don't run on private repo unless it is a PR.

scripts/release_testing_setup.sh

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,26 @@ if [ -f "${HOME}/.cocoapods/repos" ]; then
2222
find "${HOME}/.cocoapods/repos" -type d -maxdepth 1 -exec sh -c 'pod repo remove $(basename {})' \;
2323
fi
2424

25-
mkdir -p "${local_sdk_repo_dir}"
26-
echo "git clone from github.com/firebase/firebase-ios-sdk.git to ${local_sdk_repo_dir}"
27-
set +x
28-
# Using token here to update tags later.
29-
git clone -q https://"${BOT_TOKEN}"@github.com/firebase/firebase-ios-sdk.git "${local_sdk_repo_dir}"
30-
set -x
25+
if [ "$TESTINGMODE" = "release_testing" ]; then
26+
mkdir -p "${local_sdk_repo_dir}"
27+
echo "git clone from github.com/firebase/firebase-ios-sdk.git to ${local_sdk_repo_dir}"
28+
set +x
29+
# Using token here to update tags later.
30+
git clone -q https://"${BOT_TOKEN}"@github.com/firebase/firebase-ios-sdk.git "${local_sdk_repo_dir}"
31+
set -x
32+
cd "${local_sdk_repo_dir}"
33+
elif [ "$TESTINGMODE" = "prerelease_testing" ]; then
34+
git fetch --tags origin main
35+
git checkout main
36+
fi
3137

32-
cd "${local_sdk_repo_dir}"
3338
# The chunk below is to determine the latest version by searching
3439
# Get the latest released tag Cocoapods-X.Y.Z for release and prerelease testing, beta version will be excluded.
3540
test_version=$(git tag -l --sort=-version:refname --merged main CocoaPods-*[0-9] | head -n 1)
41+
if [ -z "$test_version" ]; then
42+
echo "Latest tag could not be found. Exiting." >&2
43+
exit 1
44+
fi
3645

3746
git config --global user.email "[email protected]"
3847
git config --global user.name "google-oss-bot"

0 commit comments

Comments
 (0)