diff --git a/.github/workflows/regenerate-protobuf.yml b/.github/workflows/regenerate-protobuf.yml index 69deae9..885dc08 100644 --- a/.github/workflows/regenerate-protobuf.yml +++ b/.github/workflows/regenerate-protobuf.yml @@ -10,12 +10,14 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 + # Include the pull request ref in the checkout action to prevent merge commit + # https://github.com/actions/checkout?tab=readme-ov-file#checkout-pull-request-head-commit-instead-of-merge-commit with: - ref: ${{ github.event.pull_request.head.ref }} + ref: ${{ github.event.pull_request.head.sha }} - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v5 with: go-version: "1.22.0" @@ -42,15 +44,11 @@ jobs: run: | task proto:all - - name: Configure git - run: | - git config --global user.name 'github-actions[bot]' - git config --global user.email 'github-actions[bot]@users.noreply.github.com' - - - name: Commit and push changes - run: | - git add . - git commit -m "Regenerate protobuf files" - git push origin HEAD:${{ github.event.pull_request.head.ref }} + - uses: planetscale/ghcommit-action@v0.1.6 + with: + commit_message: "🤖 regenerate protobuf files" + repo: ${{ github.repository }} + branch: ${{ github.head_ref || github.ref_name }} + file_pattern: '*.pb.go' env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/service-a/bye/bye.proto b/service-a/bye/bye.proto index e92e810..f69f560 100644 --- a/service-a/bye/bye.proto +++ b/service-a/bye/bye.proto @@ -8,6 +8,7 @@ option go_package = "github.com/graham-chainlink/shared-proto-spike/service-a/by message ByeRequest { string name = 1; string signature = 2; + string icon = 3; } // The response message containing the greetings.