diff --git a/.github/workflows/auto-merge-release.yml b/.github/workflows/auto-merge-release.yml index 30ab0e03a..f968d6abf 100644 --- a/.github/workflows/auto-merge-release.yml +++ b/.github/workflows/auto-merge-release.yml @@ -2,7 +2,7 @@ name: auto-merge-release on: schedule: - - cron: "0 10 * * *" + - cron: "0 10 * * 1" workflow_dispatch: permissions: {} @@ -34,10 +34,10 @@ jobs: range="${latest_tag}..HEAD" tag_time=$(git for-each-ref --format='%(creatordate:unix)' "refs/tags/$latest_tag") now=$(date +%s) - min_age=$((2 * 24 * 60 * 60)) + min_age=$((6 * 24 * 60 * 60)) age=$((now - tag_time)) if [ "$age" -lt "$min_age" ]; then - echo "Latest release ${latest_tag} is less than 2 days old; not auto-merging release PRs" + echo "Latest release ${latest_tag} is less than 6 days old; not auto-merging release PRs" exit 0 fi else @@ -69,7 +69,7 @@ jobs: exit 0 fi - echo "PR #$PR_NUMBER is ready for the daily release window" + echo "PR #$PR_NUMBER is ready for the weekly release window" gh pr merge "$PR_NUMBER" -R jdx/usage --squash --auto env: GH_TOKEN: ${{ secrets.MY_RELEASE_PLEASE_TOKEN }}