Skip to content

Commit

Permalink
Merge pull request #22720 from Expensify/francois-fixCherryPickDate
Browse files Browse the repository at this point in the history
  • Loading branch information
francoisl authored Jul 11, 2023
2 parents 1593735 + 1b1b367 commit acdaa22
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ git fetch origin main # This will fetch the full history of the main branch, plu
# Good
git fetch origin main --no-tags --depth=1 # This will just fetch the latest commit from main
git fetch origin tag 1.0.0-0 --no-tags --depth=1 # This will fetch the latest commit from the 1.0.0-0 tag and create a local tag to match
git fetch origin staging --no-tags --shallow-since="$(( $(date -%s) - 3600 ))" # This will fetch all commits made to the staging branch in the last hour
git fetch origin staging --no-tags --shallow-since="$(( $(date +%s) - 3600 ))" # This will fetch all commits made to the staging branch in the last hour
git fetch origin tag 1.0.1-0 --no-tags --shallow-exclude=1.0.0-0 # This will fetch all commits from the 1.0.1-0 tag, except for those that are reachable from the 1.0.0-0 tag.
```

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cherryPick.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
run: |
# Find the commit for the version-bump
# This command fetches commits in the last hour on the main branch
git fetch origin main --no-tags --shallow-since="$(( $(date -%s) - 3600 ))"
git fetch origin main --no-tags --shallow-since="$(( $(date +%s) - 3600 ))"
git switch main
VERSION_BUMP_COMMIT="$(git log --format='%H' --author='OSBotify' --grep 'Update version to ${{ needs.createNewVersion.outputs.NEW_VERSION }}')"
Expand Down

0 comments on commit acdaa22

Please sign in to comment.