Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/privacy.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2020-09-07 15:39:17 +0300
committerGeorg Ehrke <developer@georgehrke.com>2020-09-07 15:39:17 +0300
commitbd4181cee44eb8186f268455b602c829274a2891 (patch)
tree07bed611c7903d91e8f73f402d3045c6e15d316c
parentc49e2f6ba926bf48f9745a1c4d452f35eee73f7e (diff)
Automerge patch updates of dependencies
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
-rw-r--r--.github/workflows/dependabot-approve-merge.yml19
-rw-r--r--.github/workflows/dependabot-approve.yml11
2 files changed, 19 insertions, 11 deletions
diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml
new file mode 100644
index 0000000..201d7f5
--- /dev/null
+++ b/.github/workflows/dependabot-approve-merge.yml
@@ -0,0 +1,19 @@
+name: Dependabot
+on: pull_request
+
+jobs:
+ auto-merge:
+ runs-on: ubuntu-latest
+ steps:
+ # Default github action approve
+ - uses: hmarr/auto-approve-action@v2.0.0
+ if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+ with:
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+
+ # Nextcloud bot approve and merge request
+ - uses: ahmadnassri/action-dependabot-auto-merge@v1
+ if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+ with:
+ target: patch
+ github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}
diff --git a/.github/workflows/dependabot-approve.yml b/.github/workflows/dependabot-approve.yml
deleted file mode 100644
index cc5e6d1..0000000
--- a/.github/workflows/dependabot-approve.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: Dependabot auto approve
-on: pull_request
-
-jobs:
- build:
- runs-on: ubuntu-latest
- steps:
- - uses: hmarr/auto-approve-action@v2.0.0
- if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
- with:
- github-token: "${{ secrets.GITHUB_TOKEN }}"