From 3d7b636101334cfa85676bc7f58b3ed25f8039ae Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Wed, 31 Jul 2024 19:38:00 -0400 Subject: [PATCH] [Infra] Attempt to fix post-merge tagging in prerelease.yml --- .github/workflows/prerelease.yml | 2 ++ scripts/release_testing_setup.sh | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index f7004fef2fb..b1bc9225512 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -161,6 +161,8 @@ jobs: podspec_repo_branch: main steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Get token run: | scripts/decrypt_gha_secret.sh scripts/gha-encrypted/prerelease-testing-token.txt.gpg \ diff --git a/scripts/release_testing_setup.sh b/scripts/release_testing_setup.sh index 621f72460e3..f64641e4aef 100755 --- a/scripts/release_testing_setup.sh +++ b/scripts/release_testing_setup.sh @@ -31,16 +31,12 @@ if [ "$TESTINGMODE" = "release_testing" ]; then set -x cd "${local_sdk_repo_dir}" elif [ "$TESTINGMODE" = "prerelease_testing" ]; then - set -x git fetch --tags --quiet origin main git checkout main fi # The chunk below is to determine the latest version by searching # Get the latest released tag Cocoapods-X.Y.Z for release and prerelease testing, beta version will be excluded. -test_version=$(git tag -l --sort=-version:refname CocoaPods-*[0-9] | head -n 1) -test_version=$(git tag -l --sort=-version:refname 'CocoaPods-*[0-9]' | head -n 1) -test_version=$(git tag -l --sort=-version:refname --merged main CocoaPods-*[0-9] | head -n 1) test_version=$(git tag -l --sort=-version:refname --merged main 'CocoaPods-*[0-9]' | head -n 1) git for-each-ref --sort=-creatordate --format '%(creatordate:short) %(refname:short)' refs/tags | head -n 3 if [ -z "$test_version" ]; then