From ff5ca6561617eb22b2716f67cec9a1d283f9552a Mon Sep 17 00:00:00 2001
From: nextcloud-android-bot <android@nextcloud.com>
Date: Mon, 2 Sep 2024 08:10:15 +0000
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'.github/wo?=
=?UTF-8?q?rkflows/'=20with=20remote=20'config/workflows/'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
---
.github/workflows/renovate-approve-merge.yml | 58 ++++++++++++++++++++
1 file changed, 58 insertions(+)
create mode 100644 .github/workflows/renovate-approve-merge.yml
diff --git a/.github/workflows/renovate-approve-merge.yml b/.github/workflows/renovate-approve-merge.yml
new file mode 100644
index 000000000..48b98e91a
--- /dev/null
+++ b/.github/workflows/renovate-approve-merge.yml
@@ -0,0 +1,58 @@
+# This workflow is provided via the organization template repository
+#
+# https://github.com/nextcloud/.github
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
+
+name: Auto approve renovate PRs
+
+on:
+ pull_request_target:
+ branches:
+ - main
+ - master
+ - stable*
+
+permissions:
+ contents: read
+
+concurrency:
+ group: renovate-approve-merge-${{ github.head_ref || github.run_id }}
+ cancel-in-progress: true
+
+jobs:
+ auto-approve-merge:
+ if: github.actor == 'renovate[bot]'
+ runs-on: ubuntu-latest
+ permissions:
+ # for hmarr/auto-approve-action to approve PRs
+ pull-requests: write
+ # for alexwilson/enable-github-automerge-action to approve PRs
+ contents: write
+
+ steps:
+ - name: Disabled on forks
+ if: ${{ github.event.pull_request.head.repo.full_name != github.repository }}
+ run: |
+ echo 'Can not approve PRs from forks'
+ exit 1
+
+ - uses: mdecoleman/pr-branch-name@55795d86b4566d300d237883103f052125cc7508 # v3.0.0
+ id: branchname
+ with:
+ repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+ # GitHub actions bot approve
+ - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
+ if: startsWith(steps.branchname.outputs.branch, 'renovate/')
+ with:
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+
+ # Enable GitHub auto merge
+ - name: Auto merge
+ uses: alexwilson/enable-github-automerge-action@main
+ if: startsWith(steps.branchname.outputs.branch, 'renovate/')
+ with:
+ github-token: ${{ secrets.GITHUB_TOKEN }}
From 813d4f6b81898554ac312de89b918ab58c663180 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Mon, 2 Sep 2024 10:16:38 +0200
Subject: [PATCH 2/2] chore: cleanup legacy approval flows
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
.github/workflows/autoApproveDependabot.yml | 35 ---------------
.github/workflows/autoApproveRenovate.yml | 49 ---------------------
2 files changed, 84 deletions(-)
delete mode 100644 .github/workflows/autoApproveDependabot.yml
delete mode 100644 .github/workflows/autoApproveRenovate.yml
diff --git a/.github/workflows/autoApproveDependabot.yml b/.github/workflows/autoApproveDependabot.yml
deleted file mode 100644
index eda6392b5..000000000
--- a/.github/workflows/autoApproveDependabot.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-# synced from @nextcloud/android-config
-
-# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-FileCopyrightText: 2023 Álvaro Brey <alvaro@alvarobrey.com>
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-name: Auto approve dependabot
-
-on:
- pull_request_target:
- branches:
- - main
- - master
- - stable-*
-
-permissions:
- contents: read
-
-concurrency:
- group: dependabot-approve-${{ github.head_ref || github.run_id }}
- cancel-in-progress: true
-
-jobs:
- auto-approve:
- name: Auto approve dependabot
- runs-on: ubuntu-latest
- if: github.actor == 'dependabot[bot]'
- permissions:
- # needed to approve the PR
- pull-requests: write
-
- steps:
- - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
- with:
- github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/autoApproveRenovate.yml b/.github/workflows/autoApproveRenovate.yml
deleted file mode 100644
index f5e3f0cea..000000000
--- a/.github/workflows/autoApproveRenovate.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-# SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-FileCopyrightText: 2023 Álvaro Brey <alvaro@alvarobrey.com>
-# SPDX-FileCopyrightText: 2023 Andy Scherzinger <info@andy-scherzinger.de>
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-name: Auto approve renovate PRs
-
-on:
- pull_request_target:
- branches:
- - main
- - master
- - stable*
-
-permissions:
- contents: read
-
-concurrency:
- group: renovate-approve-merge-${{ github.head_ref || github.run_id }}
- cancel-in-progress: true
-
-jobs:
- auto-approve-merge:
- if: github.actor == 'renovate[bot]'
- runs-on: ubuntu-latest
- permissions:
- # for hmarr/auto-approve-action to approve PRs
- pull-requests: write
- # for alexwilson/enable-github-automerge-action to approve PRs
- contents: write
-
- steps:
- - uses: mdecoleman/pr-branch-name@55795d86b4566d300d237883103f052125cc7508 # v3.0.0
- id: branchname
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
-
- # GitHub actions bot approve
- - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
- if: startsWith(steps.branchname.outputs.branch, 'renovate/')
- with:
- github-token: ${{ secrets.GITHUB_TOKEN }}
-
- # Enable GitHub auto merge
- - name: Auto merge
- uses: alexwilson/enable-github-automerge-action@main
- if: startsWith(steps.branchname.outputs.branch, 'renovate/')
- with:
- github-token: ${{ secrets.GITHUB_TOKEN }}