Просмотр исходного кода

Merge branch 'hotfix/v21.3.3' into develop

Daniel Gibbs 4 лет назад
Родитель
Сommit
a4bb3856f3

+ 0 - 13
.github/potential-duplicates.yml

@@ -1,13 +0,0 @@
-# Label name and color to set, when potential duplicates are detected
-issueLabel: "duplicate"
-labelColor: 579e01
-
-# If similarity is higher than this threshold, issue will be marked as duplicate
-threshold: 0.60
-
-# Comment to post when potential duplicates are detected
-referenceComment: >
-  Potential duplicates:
-  {{#issues}}
-    - [#{{ number }}] {{ title }} ({{ accuracy }}%)
-  {{/issues}}

+ 26 - 1
.github/release-drafter.yml

@@ -1,4 +1,29 @@
+version-template: 'v21.$MINOR.$PATCH'
+name-template: '$RESOLVED_VERSION'
+tag-template: '$RESOLVED_VERSION'
+categories:
+  - title: '🚀 Features'
+    labels:
+      - 'feature'
+      - 'enhancement'
+  - title: '🐛 Bug Fixes'
+    labels:
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
+  - title: '🧰 Maintenance'
+    label: 'chore'
+change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
+version-resolver:
+  minor:
+    labels:
+      - 'release'
+  patch:
+    labels:
+      - 'hotfix'
+  default: patch
 template: |
-  ## What’s Changed
+  ## Changes
 
   $CHANGES

+ 4 - 5
.github/workflows/git-sync.yml

@@ -5,18 +5,17 @@ on:
   push:
     branches:
       - master
-      - 'develop'
-
+      - develop
 jobs:
-  repo-sync:
+  GitHub-to-Bitbucket:
     runs-on: ubuntu-latest
     steps:
-    - name: webfactory/ssh-agent
+    - name: webfactory/ssh-agent@v0.5.3
       uses: webfactory/ssh-agent@v0.5.3
       with:
         ssh-private-key: ${{ secrets.BITBUCKET_SECRET }}
 
-    - name: repo-sync
+    - name: wei/git-sync@v3.0.0
       uses: wei/git-sync@v3.0.0
       with:
         ssh_private_key: ${{ secrets.BITBUCKET_SECRET }}

+ 31 - 0
.github/workflows/potential-duplicates.yml

@@ -0,0 +1,31 @@
+name: Potential Duplicates
+on:
+  issues:
+    types: [opened]
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: wow-actions/potential-duplicates@v1
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # Issue title filter work with anymatch https://www.npmjs.com/package/anymatch.
+          # Any matched issue will stop detection immediately.
+          # You can specify multi filters in each line.
+          filter: ''
+          # Exclude keywords in title before detecting.
+          exclude: ''
+          # Label to set, when potential duplicates are detected.
+          label: potential-duplicate
+          # Get issues with state to compare. Supported state: 'all', 'closed', 'open'.
+          state: all
+          # If similarity is higher than this threshold([0,1]), issue will be marked as duplicate.
+          threshold: 0.6
+          # Reactions to be add to comment when potential duplicates are detected.
+          # Available reactions: "-1", "+1", "confused", "laugh", "heart", "hooray", "rocket", "eyes"
+          #reactions: 'eyes, confused'
+          # Comment to post when potential duplicates are detected.
+          comment: >
+            Potential duplicates: {{#issues}}
+              - [#{{ number }}] {{ title }} ({{ accuracy }}%)
+            {{/issues}}

+ 29 - 0
.github/workflows/release-drafter.yml

@@ -0,0 +1,29 @@
+name: Release Drafter
+
+on:
+  push:
+    # branches to consider in the event; optional, defaults to all
+    branches:
+      - master
+  # pull_request event is required only for autolabeler
+  pull_request:
+    # Only following types are handled by the action, but one can default to all as well
+    types: [opened, reopened, synchronize]
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      # (Optional) GitHub Enterprise requires GHE_HOST variable set
+      #- name: Set GHE_HOST
+      #  run: |
+      #    echo "GHE_HOST=${GITHUB_SERVER_URL##https:\/\/}" >> $GITHUB_ENV
+
+      # 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
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

+ 1 - 1
lgsm/functions/core_functions.sh

@@ -8,7 +8,7 @@
 
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-modulesversion="v21.3.2"
+modulesversion="v21.3.3"
 
 # Core
 

+ 1 - 1
linuxgsm.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v21.3.2"
+version="v21.3.3"
 shortname="core"
 gameservername="core"
 commandname="CORE"

+ 1 - 1
tests/tests_fctrserver.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v21.3.2"
+version="v21.3.3"
 shortname="fctr"
 gameservername="fctrserver"
 commandname="CORE"

+ 1 - 1
tests/tests_jc2server.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v21.3.2"
+version="v21.3.3"
 shortname="jc2"
 gameservername="jc2server"
 commandname="CORE"

+ 1 - 1
tests/tests_mcserver.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v21.3.2"
+version="v21.3.3"
 shortname="mc"
 gameservername="mcserver"
 commandname="CORE"

+ 1 - 1
tests/tests_ts3server.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v21.3.2"
+version="v21.3.3"
 shortname="ts3"
 gameservername="ts3server"
 commandname="CORE"