Skip to content

Commit eef704e

Browse files
TEST: DO NOT MERGE, TESTING AUTOMATIC PR CREATION
1 parent 4834950 commit eef704e

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

.github/workflows/ci-pre-commit.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,4 @@ on:
66

77
jobs:
88
pre-commit:
9-
uses: ./.github/workflows/reusable-pre-commit.yml
10-
with:
11-
ros_distro: humble
9+
uses: ./.github/workflows/reusable-update-pre-commit.yml

.github/workflows/reusable-update-pre-commit.yml

+14-9
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,26 @@ jobs:
6363
with:
6464
token: ${{ secrets.GITHUB_TOKEN }}
6565
branch: auto-update-${{ github.event.inputs.ref_for_scheduled_build }}
66+
base: main
6667
commit-message: Bump version of pre-commit hooks
6768
title: Bump version of pre-commit hooks
6869
body: This pull request contains auto-updated files of the pre-commit config.
6970
delete-branch: true
70-
draft: true
71+
draft: false
7172
path: ${{ env.path }}
7273

73-
- name: Auto approve
74-
if: steps.cpr.outputs.pull-request-operation == 'created'
75-
run: gh pr review --approve "${{ steps.cpr.outputs.pull-request-number }}"
76-
env:
77-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
74+
# - name: Enable Pull Request Automerge
75+
# if: steps.cpr.outputs.pull-request-operation == 'created'
76+
# run: |
77+
# cd ${{ env.path }}
78+
# gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}"
79+
# env:
80+
# GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7881

79-
- name: Enable Pull Request Automerge
82+
- name: Auto approve
8083
if: steps.cpr.outputs.pull-request-operation == 'created'
81-
run: gh pr merge --merge --auto "1"
84+
run: |
85+
cd ${{ env.path }}
86+
gh pr review --approve "${{ steps.cpr.outputs.pull-request-number }}"
8287
env:
83-
GH_TOKEN: ${{ secrets.PAT }}
88+
GH_TOKEN: ${{ secrets.PRECOMMIT_AUTOUPDATE_PR_TOKEN }}

0 commit comments

Comments
 (0)