From 688e88709be0605ad676c2d643885de358c6e225 Mon Sep 17 00:00:00 2001 From: Jason Robinaugh Date: Thu, 14 May 2026 11:23:35 -0400 Subject: [PATCH 1/2] Delegate auto-merge to github/create-pull-request in rwx/update-packages-github Bump rwx/update-packages-github to 2.0.3, upgrade the inner github/create-pull-request call to 1.0.7, and pass enable-auto-merge through so auto-merge runs alongside reviewer requests in the package. Drop the local gh pr merge --auto --squash fallback in pull-request-options; the inner package now owns that behavior. --- rwx/update-packages-github/README.md | 6 +++--- rwx/update-packages-github/rwx-package.yml | 9 +++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/rwx/update-packages-github/README.md b/rwx/update-packages-github/README.md index cef455c..31dd902 100644 --- a/rwx/update-packages-github/README.md +++ b/rwx/update-packages-github/README.md @@ -20,7 +20,7 @@ To update minor versions (recommended): ```yaml tasks: - key: update-rwx-packages - call: rwx/update-packages-github 2.0.2 + call: rwx/update-packages-github 2.0.3 with: repository: https://github.com/YOUR-ORG/YOUR-REPO.git ref: ${{ init.commit-sha }} @@ -32,7 +32,7 @@ Customize the label: ```yaml tasks: - key: update-rwx-packages - call: rwx/update-packages-github 2.0.2 + call: rwx/update-packages-github 2.0.3 with: repository: https://github.com/YOUR-ORG/YOUR-REPO.git ref: ${{ init.commit-sha }} @@ -51,7 +51,7 @@ Requires repository auto-merge support. ```yaml tasks: - key: update-rwx-packages - call: rwx/update-packages-github 2.0.2 + call: rwx/update-packages-github 2.0.3 with: repository: https://github.com/YOUR-ORG/YOUR-REPO.git ref: ${{ init.commit-sha }} diff --git a/rwx/update-packages-github/rwx-package.yml b/rwx/update-packages-github/rwx-package.yml index 3ebb29e..cc05c77 100644 --- a/rwx/update-packages-github/rwx-package.yml +++ b/rwx/update-packages-github/rwx-package.yml @@ -1,5 +1,5 @@ name: rwx/update-packages-github -version: 2.0.2 +version: 2.0.3 description: Update RWX packages for GitHub repositories source_code_url: https://github.com/rwx-cloud/packages/tree/main/rwx/update-packages-github issue_tracker_url: https://github.com/rwx-cloud/packages/issues @@ -67,7 +67,7 @@ tasks: RWX_FILE: ${{ params.rwx-file}} - key: create-or-update-pr - call: github/create-pull-request 1.0.3 + call: github/create-pull-request 1.0.7 use: update-packages with: github-token: ${{ params.github-token }} @@ -79,6 +79,7 @@ tasks: ``` ${{ tasks.update-packages.values.update-output }} ``` + enable-auto-merge: ${{ params.enable-auto-merge }} - key: pull-request-options use: [gh-cli, code] @@ -89,11 +90,7 @@ tasks: gh label create "$GITHUB_LABEL" --color "$GITHUB_LABEL_COLOR" || true gh pr edit "$GITHUB_PR_NUMBER" --add-label "$GITHUB_LABEL" fi - if [ "$ENABLE_AUTO_MERGE" = "true" ] && [ -n "$GITHUB_PR_NUMBER" ]; then - gh pr merge "$GITHUB_PR_NUMBER" --auto --squash || true - fi env: - ENABLE_AUTO_MERGE: ${{ params.enable-auto-merge }} GITHUB_TOKEN: ${{ params.github-token }} GITHUB_LABEL: ${{ params.label }} GITHUB_LABEL_COLOR: ${{ params.label-color }} From 270db9c8b0a39e788b2f8282586d3d7f81904f71 Mon Sep 17 00:00:00 2001 From: Jason Robinaugh Date: Thu, 14 May 2026 11:27:21 -0400 Subject: [PATCH 2/2] Update transitive package versions in rwx/update-packages-github Bring rwx/install-cli, github/install-cli, and git/clone up to their latest published versions so check-packages CI passes. --- rwx/update-packages-github/rwx-package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rwx/update-packages-github/rwx-package.yml b/rwx/update-packages-github/rwx-package.yml index cc05c77..3e3a3ab 100644 --- a/rwx/update-packages-github/rwx-package.yml +++ b/rwx/update-packages-github/rwx-package.yml @@ -34,13 +34,13 @@ parameters: tasks: - key: rwx-cli - call: rwx/install-cli 4.0.1 + call: rwx/install-cli 4.0.4 - key: gh-cli - call: github/install-cli 1.0.8 + call: github/install-cli 1.0.10 - key: code - call: git/clone 2.0.0 + call: git/clone 2.0.7 with: repository: ${{ params.repository }} ref: ${{ params.ref }}