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

roryabraham · 2025-04-15T20:05:35Z

Explanation of Change

Ensure the ref used in --shallow-exclude is a real tag that exists by checking first and tacking on -staging if it's not found.

Also (dramatically) speed up fetching by adding --no-recurse-submodules.

Fixed Issues

$ maybe https://expensify.slack.com/archives/C07J32337/p1744740685471859

Tests

Tested locally with this script:

#!/bin/bash

mkdir ~/AppFetchTest
trap 'rm -rf ~/AppFetchTest' EXIT

echo "Initializing repo in ~/AppFetchTest"
cd ~/AppFetchTest
git init
git remote add origin [email protected]:Expensify/App.git
git config --local gc.auto 0

echo "Fetching parent repo"
time git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +refs/heads/staging*:refs/remotes/origin/staging* +refs/tags/staging*:refs/tags/staging*

echo "Initializing submodules"
git checkout --progress --force -B staging refs/remotes/origin/staging
git submodule sync
git submodule update --init --force --depth=1
git submodule foreach git config --local gc.auto 0

echo "Parent ref"
git log -1 --format='%H'

echo "Enabling branch switching in submodules"
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"'

echo "Fetching history in parent repo"
# Temporary hack during transition when -staging suffix is being added to tags
if git ls-remote origin refs/tags/9.1.27-0 | grep -q . ; then
  time git fetch origin main staging --no-recurse-submodules --no-tags --shallow-exclude 9.1.27-0
else
  time git fetch origin main staging --no-recurse-submodules --no-tags --shallow-exclude 9.1.27-0-staging
fi


echo "Fetching history in submodule"
cd Mobile-Expensify
# Temp hack
if git ls-remote origin refs/tags/9.1.27-0 | grep -q . ; then
  time git fetch origin main staging --no-tags --shallow-exclude 9.1.27-0
else
  time git fetch origin main staging --no-tags --shallow-exclude 9.1.27-0-staging
fi
cd ..

git switch main
VERSION_BUMP_COMMIT="$(git log -1 --format='%H' --author='OSBotify' --grep 'Update version to 9.1.28-3')"
if [ -z "$VERSION_BUMP_COMMIT" ]; then
  echo "::error::❌ Could not find E/App version bump commit for 9.1.28-3"
  git log --oneline
else
  echo "::notice::👀 Found E/App version bump commit $VERSION_BUMP_COMMIT"
fi

cd Mobile-Expensify
git switch main
VERSION_BUMP_COMMIT="$(git log -1 --format='%H' --author='OSBotify' --grep 'Update version to 9.1.28-3')"
if [ -z "$VERSION_BUMP_COMMIT" ]; then
  echo "::error::❌ Could not find Mobile-Expensify version bump commit for 9.1.28-3"
  git log --oneline
else
  echo "::notice::👀 Found Mobile-Expensify version bump commit $VERSION_BUMP_COMMIT"
fi

Offline tests

None.

QA Steps

None

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-04-15T20:05:40Z

@ Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

marcaaron · 2025-04-15T20:12:52Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

OSBotify · 2025-04-15T20:22:33Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2025-04-16T21:40:59Z

🚀 Deployed to staging by https://github.com/marcaaron in version: 9.1.29-0 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

github-actions · 2025-04-18T20:32:57Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.1.29-10 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	failure ❌
🍎 iOS 🍎	success ✅

Fix tag fetching in cherryPick.yml

0d42b66

roryabraham requested a review from marcaaron April 15, 2025 20:05

roryabraham self-assigned this Apr 15, 2025

roryabraham requested a review from a team as a code owner April 15, 2025 20:05

melvin-bot bot removed the request for review from a team April 15, 2025 20:05

Fix unended single quote

40dba4a

marcaaron approved these changes Apr 15, 2025

View reviewed changes

marcaaron merged commit d99cc2a into main Apr 15, 2025
11 checks passed

marcaaron deleted the Rory-FixCPFetch branch April 15, 2025 20:13

github-actions bot mentioned this pull request Apr 16, 2025

Deploy Checklist: New Expensify 2025-04-16 #60369

Closed

87 tasks

roryabraham mentioned this pull request Apr 24, 2025

[No QA] Remove temporary hack in cherryPick fetch #60871

Merged

50 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

roryabraham commented Apr 15, 2025 •

edited

Loading

melvin-bot bot commented Apr 15, 2025

marcaaron commented Apr 15, 2025 •

edited

Loading

OSBotify commented Apr 15, 2025

github-actions bot commented Apr 16, 2025

github-actions bot commented Apr 18, 2025

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

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

Conversation

roryabraham commented Apr 15, 2025 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 15, 2025

marcaaron commented Apr 15, 2025 • edited Loading

Reviewer Checklist

Screenshots/Videos

OSBotify commented Apr 15, 2025

github-actions bot commented Apr 16, 2025

github-actions bot commented Apr 18, 2025

roryabraham commented Apr 15, 2025 •

edited

Loading

marcaaron commented Apr 15, 2025 •

edited

Loading