Skip to content

[No QA] Fix tag fetching in cherryPick.yml #60321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcaaron merged 2 commits into from
Apr 15, 2025
Merged

[No QA] Fix tag fetching in cherryPick.yml #60321

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d42b66
Fix tag fetching in cherryPick.yml
roryabraham Apr 15, 2025
40dba4a
Fix unended single quote
roryabraham Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions .github/workflows/cherryPick.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ jobs:
run: |
git submodule foreach '\
git config --add remote.origin.fetch "+refs/heads/staging:refs/remotes/origin/staging" && \
git config --add remote.origin.fetch "+refs/heads/production:refs/remotes/origin/production" && \
git config --add remote.origin.fetch "+refs/tags/*:refs/tags/*"'
git config --add remote.origin.fetch "+refs/heads/production:refs/remotes/origin/production"'

- name: Set up git for OSBotify
id: setupGitForOSBotify
Expand All @@ -53,9 +52,20 @@ jobs:

- name: Fetch history of relevant refs
run: |
git fetch origin main staging --no-tags --shallow-exclude ${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }}
# Temporary hack during transition when -staging suffix is being added to tags
if git ls-remote origin refs/tags/${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }} | grep -q . ; then
git fetch origin main staging --no-recurse-submodules --no-tags --shallow-exclude ${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }}
else
git fetch origin main staging --no-recurse-submodules --no-tags --shallow-exclude ${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }}-staging
fi

cd Mobile-Expensify
git fetch origin main staging --no-tags --shallow-exclude ${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }}
# Temporary hack during transition when -staging suffix is being added to tags
if git ls-remote origin refs/tags/${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }} | grep -q . ; then
git fetch origin main staging --no-recurse-submodules --no-tags --shallow-exclude ${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }}
else
git fetch origin main staging --no-recurse-submodules --no-tags --shallow-exclude ${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }}-staging
fi

- name: Get E/App version bump commit
id: getVersionBumpCommit
Expand Down