Skip to content

Commit 8034506

Browse files
committed
CI: Fix broken dependency
Signed-off-by: Tim Meusel <tim@bastelfreak.de>
1 parent 27e1056 commit 8034506

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

.github/workflows/backport.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
---
22
name: Backport merged pull request
33

4-
54
on:
6-
workflow_call: {}
5+
workflow_dispatch: {}
76
secrets:
8-
OPENVOXBOT_SSH_PRIVATE_KEY:
7+
ssh_private_key:
98
description: 'ssh private key to sign commits'
109
required: true
11-
OPENVOXBOT_COMMIT_AND_PRS:
10+
github_pat:
1211
# Provide a fine-grained token with the following repository permissions:
1312
# * Contents: Read and write
1413
# * Metadata: Read-only (mandatory, default)
@@ -37,7 +36,7 @@ jobs:
3736
- name: Add SSH key
3837
run: |
3938
mkdir -p ~/.ssh
40-
echo "${{ secrets.OPENVOXBOT_SSH_PRIVATE_KEY }}" > ~/.ssh/github_actions
39+
echo "${{ secrets.ssh_private_key }}" > ~/.ssh/github_actions
4140
chmod 600 ~/.ssh/github_actions
4241
ssh-agent -a $SSH_AUTH_SOCK > /dev/null
4342
ssh-add ~/.ssh/github_actions
@@ -53,13 +52,13 @@ jobs:
5352
- name: Checkout repository
5453
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
5554
with:
56-
token: ${{ secrets.OPENVOXBOT_COMMIT_AND_PRS }}
55+
token: ${{ secrets.github_pat }}
5756
ref: main
5857
- name: Create backport pull requests
5958
uses: korthout/backport-action@2e830a1d0b8269505846ddd407a70876913ad1f8 # v4.6.0
6059
with:
6160
auto_merge_enabled: true
6261
auto_merge_method: merge
63-
github_token: ${{ secrets.OPENVOXBOT_COMMIT_AND_PRS }}
62+
github_token: ${{ secrets.github_pat }}
6463
git_committer_name: OpenVoxProjectBot
6564
git_committer_email: 215568489+OpenVoxProjectBot@users.noreply.github.com

.github/workflows/test.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ jobs:
1111
automerge:
1212
name: Enable auto-merge
1313
if: github.event_name == 'pull_request' && (github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'renovate[bot]')
14-
needs:
15-
- unit
1614
runs-on: ubuntu-latest
1715
permissions:
1816
contents: write

0 commit comments

Comments
 (0)