From f5d9d6aa01b4eeca80edbcc5bd20d797db5a1216 Mon Sep 17 00:00:00 2001 From: lea Date: Thu, 4 Apr 2024 17:46:01 -0700 Subject: [PATCH] fix: reset author and sign during backport (#1069) (cherry picked from commit 6cd29151b7aaa7d9608793115f8b9d383031fb93) # Conflicts: # .backportrc.json --- .backportrc.json | 9 +++++++++ .github/workflows/sync.yml | 12 ++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 .backportrc.json diff --git a/.backportrc.json b/.backportrc.json new file mode 100644 index 0000000000..1a999fa4f8 --- /dev/null +++ b/.backportrc.json @@ -0,0 +1,9 @@ +{ + "repoOwner": "terrapkg", + "repoName": "packages", + "resetAuthor": true, + "targetBranchChoices": ["f38", "f39", "f40", "frawhide"], + "branchLabelMapping": { + "^sync-(.+)$": "$1" + } +} diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index dcdc05ccda..e4ec6cabca 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -9,6 +9,18 @@ jobs: name: Backport/sync PR runs-on: ubuntu-latest steps: + - name: Install SSH signing key + run: | + mkdir -p ${{ runner.temp }} + echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key + chmod 0700 ${{ runner.temp }}/signing_key + + - name: Setup Raboneko Signing + run: | + git config --global gpg.format "ssh" + git config --global user.signingkey "${{ runner.temp }}/signing_key" + git config --global commit.gpgsign true + - name: Backport Action uses: sorenlouv/backport-github-action@v9.3.0 with: