From 9c8780f99a32d6bd26fbb9c430ca2a3c9d0517b7 Mon Sep 17 00:00:00 2001
From: Michael Buluma <bulumaknight@gmail.com>
Date: Tue, 9 Jan 2024 10:06:34 +0300
Subject: [PATCH] merge update.

---
 .github/release-drafter.yml            | 11 ++++-----
 .github/workflows/depandabot_merge.yml | 27 ++++++++++++++++++++++
 .github/workflows/release_drafter.yml  | 31 +++++++++++++++++---------
 LICENSE                                |  2 +-
 4 files changed, 54 insertions(+), 17 deletions(-)
 create mode 100644 .github/workflows/depandabot_merge.yml

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index f39857b..3e9b50f 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -1,12 +1,13 @@
 ---
-name-template: 'v$RESOLVED_VERSION 🌈'
-tag-template: 'v$RESOLVED_VERSION'
+name-template: 'v$NEXT_MINOR_VERSION'
+tag-template: 'v$NEXT_MINOR_VERSION'
 categories:
   - title: '🚀 Features'
     labels:
       - 'feature'
       - 'enhancement'
-  - title: '🐛 Bug Fixes'
+      - 'dependencies'
+  - title: '🐛 Role Fixes'
     labels:
       - 'fix'
       - 'bugfix'
@@ -25,8 +26,8 @@ version-resolver:
   patch:
     labels:
       - 'patch'
-  default: patch
+  default: minor
 template: |
-  ## Rifle, Rifle, Rifle!
+  ## What’s Changed
 
   $CHANGES
diff --git a/.github/workflows/depandabot_merge.yml b/.github/workflows/depandabot_merge.yml
new file mode 100644
index 0000000..e496be8
--- /dev/null
+++ b/.github/workflows/depandabot_merge.yml
@@ -0,0 +1,27 @@
+---
+#
+# Ansible managed
+#
+
+name: "Dependabot Merge"
+
+on:
+  pull_request:
+  pull_request_target:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+
+jobs:
+  dependabot_merge:
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: "actions/checkout@master"
+      - name: Dependabot Auto Merge Action
+        uses: buluma/dependabot-auto-merge-action@v2.0.2
diff --git a/.github/workflows/release_drafter.yml b/.github/workflows/release_drafter.yml
index c65a909..c35e7a4 100644
--- a/.github/workflows/release_drafter.yml
+++ b/.github/workflows/release_drafter.yml
@@ -7,10 +7,11 @@ name: Release Drafter
 
 on:
   push:
-    # branches to consider in the event; optional, defaults to all
+    # branches to consider in the event; optional, defaults to default
     branches:
       - master
       - main
+      - dependabot/**
       - testing
     paths-ignore:
       - '**/README.md'
@@ -19,6 +20,9 @@ on:
   pull_request:
     # Only following types are handled by the action, but one can default to all as well
     types: [opened, reopened, synchronize]
+  pull_request_target:
+
+permissions: write-all
 
 concurrency:
   group: ${{ github.ref }}-${{ github.workflow }}
@@ -26,15 +30,21 @@ concurrency:
 
 jobs:
   update_release_draft:
+    permissions:
+      # write permission is required to create a github release
+      contents: write
+      # write permission is required for autolabeler
+      # otherwise, read permission is required at least
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
 
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - uses: release-drafter/release-drafter@v5
         # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
-        # with:
-        #   config-name: my-config.yml
-        #   disable-autolabeler: true
+        with:
+          config-name: release-drafter.yml
+          disable-autolabeler: false
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   changelog_draft:
@@ -42,21 +52,20 @@ jobs:
 
     steps:
       - name: Checkout dj-wasabi-release repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: dj-wasabi/dj-wasabi-release
           path: dj-wasabi-release
 
       - name: Checkout current repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
-          path: master
-
+          path: ${{ github.event.repository.default_branch }}
       - name: Commit Changelog file
         run: |
-          # We are cloned in the 'main' directory and the dj-wasabi-release
-          # repository is the 'dj-wasabi-release' next to 'main'
-          cd master
+          # We are cloned in the 'default' directory and the dj-wasabi-release
+          # repository is the 'dj-wasabi-release' next to 'default'
+          cd ${{ github.event.repository.default_branch }}
           # Generate CHANGELOG.md file
           ../dj-wasabi-release/release.sh -d
           # Let commit the changes if there are any? (Well there should be!)
diff --git a/LICENSE b/LICENSE
index 5bb4321..b1377f8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023 Shadow Walker (bulumaknight@gmail.com)
+   Copyright 2024 Shadow Walker (bulumaknight@gmail.com)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.