diff --git a/.github/workflows/README.md b/.github/workflows/README.md index f1078446fddf..caaa06bc597d 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -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. ``` diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml index 03cc42ae92e7..cca6378e72f2 100644 --- a/.github/workflows/cherryPick.yml +++ b/.github/workflows/cherryPick.yml @@ -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 }}')"