Merge branch 'main' into multi-selection

ChrisTitusTech · Sep 11, 2024 · ea92fba · ea92fba
2 parents 591e837 + c905aee
commit ea92fba
Show file tree

Hide file tree

Showing 23 changed files with 519 additions and 313 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: ''
+labels: 'bug'
 assignees: ''
 ---
 

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: ''
+labels: 'enhancement'
 assignees: ''
 
 ---

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -1,5 +1,6 @@
 name-template: '$RESOLVED_VERSION'
 tag-template: '$RESOLVED_VERSION'
+tag-prefix: ""
 categories:
   - title: '🚀 Features'
     labels:
@@ -10,8 +11,10 @@ categories:
       - 'fix'
       - 'bugfix'
       - 'bug'
-  - title: '🧰 Maintenance'
-    label: 'chore'
+  - title: '📚 Documentation'
+    label: 'documentation'
+  - title: '🔒 Security'
+    label: 'security'
 change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
 template: |
   ## Changes
@@ -20,4 +23,38 @@ template: |
 
   ## Contributors
 
-  $CONTRIBUTORS
+  $CONTRIBUTORS
+
+change-title-escapes: '\<*_&"'''
+autolabeler:
+  - label: 'documentation'
+    files:
+      - '*.md'
+    branch:
+      - '/docs{0,1}\/.+/'
+  - label: 'bug'
+    branch:
+      - '/fix\/.+/'
+    title:
+      - '/fix/i'
+  - label: 'enhancement'
+    branch:
+      - '/feature\/.+/'
+    body:
+      - '/[A-Z]+-[0-9]+/'
+  - label: 'documentation'
+    files:
+      - '**/*.md'
+      - 'docs/**/*'
+  - label: 'security'
+    branch:
+      - '/security\/.+/'
+replacers:
+  - search: /"/g
+    replace: ''
+  - search: /'/g
+    replace: ''
+  - search: /`/g
+    replace: ''
+exclude-labels:
+  - 'skip-changelog'
diff --git a/.github/workflows/cargo-lock.yml b/.github/workflows/cargo-lock.yml
@@ -0,0 +1,25 @@
+name: Remove Cargo.lock changes
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+    paths:
+      - 'Cargo.lock'
+
+jobs:
+  remove-cargo-lock:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Remove Cargo.lock changes
+        run: |
+          git config user.name github-actions
+          git config user.email [email protected]
+          git checkout ${{ github.head_ref }}
+          git reset origin/${{ github.base_ref }} -- Cargo.lock
+          git commit -m "Remove changes to Cargo.lock" || echo "No changes to commit"
+          git push origin ${{ github.head_ref }} --force
diff --git a/.github/workflows/pre-release.yaml b/.github/workflows/pre-release.yaml
@@ -27,21 +27,12 @@ jobs:
 
       - name: Generate Release Notes
         id: generate_notes
-        uses: release-drafter/release-drafter@v5
+        uses: release-drafter/release-drafter@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           config-name: release-drafter.yml
           version: ${{ env.version }}
-          version-template: '$YEAR.$MONTH.$DAY'
-
-      - name: Prepare Release Body
-        id: prepare_body
-        run: |
-          new_changes="${{ steps.generate_notes.outputs.body }}"
-          echo "body<<EOF" >> $GITHUB_OUTPUT
-          echo "$new_changes" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
 
       - name: Create and Upload Release
         id: create_release
@@ -50,7 +41,7 @@ jobs:
           tag_name: ${{ env.version }}
           name: Pre-Release ${{ env.version }}
           body: |
-            ${{ steps.prepare_body.outputs.body }}
+            ${{ steps.generate_notes.outputs.body }}
             
             ![GitHub Downloads (specific asset, specific tag)](https://img.shields.io/github/downloads/ChrisTitusTech/linutil/${{ env.version }}/linutil)
           append_body: false