Skip to content

Commit 3002093

Browse files
dgibbs64dgibbs64
committed
Merge branch 'hotfix/v23.3.4'
2 parents e798005 + 28adc88 commit 3002093

20 files changed

+74
-81
lines changed

‎.github/workflows/add-to-project.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Add to project
1+
name: Add to Project
22
on:
33
issues:
44
types:
@@ -7,10 +7,10 @@ on:
77

88
jobs:
99
add-to-project:
10-
name: Add game server requests to project
1110
runs-on: ubuntu-latest
1211
steps:
13-
- uses: actions/add-to-project@v0.5.0
12+
- name: Add to Project
13+
uses: actions/add-to-project@v0.5.0
1414
with:
1515
project-url: https://github.com/orgs/GameServerManagers/projects/11
1616
github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}

‎.github/workflows/details-check.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: Details Check
21
# This action will check that LinuxGSM is picking up game server config and parameter variables.
2+
name: Details Check
33
on:
44
workflow_dispatch:
55
push:
@@ -16,7 +16,8 @@ jobs:
1616
- name: Generate matrix with generate-matrix.sh
1717
run: chmod +x .github/workflows/detals-check-generate-matrix.sh; .github/workflows/detals-check-generate-matrix.sh
1818

19-
- id: set-matrix
19+
- name: Set Matrix
20+
id: set-matrix
2021
run: |
2122
shortnamearray=$(cat shortnamearray.json)
2223
echo "${shortnamearray}"
@@ -43,8 +44,8 @@ jobs:
4344
- name: Enable developer mode
4445
run: LGSM_GITHUBBRANCH="${GITHUB_REF#refs/heads/}" ./${{ matrix.shortname }}server developer
4546

46-
- id: sets-servercfgname
47-
name: Generate servercfgname
47+
- name: Generate servercfgname
48+
id: sets-servercfgname
4849
run: |
4950
servercfg=$(sed -n "/^\<servercfgdefault\>/ { s/.*= *\"\?\([^\"']*\)\"\?/\1/p;q }" lgsm/config-lgsm/${{ matrix.shortname }}server/_default.cfg)
5051
echo "servercfgname=$servercfg" >> "$GITHUB_OUTPUT"
@@ -54,7 +55,7 @@ jobs:
5455
if [ -z "${{ steps.sets-servercfgname.outputs.servercfgname }}" ]; then
5556
echo "This game server has no config file."
5657
else
57-
curl -f -o config "https://raw.githubusercontent.com/GameServerManagers/Game-Server-Configs/rename/${{ matrix.shortname }}/${{ steps.sets-servercfgname.outputs.servercfgname }}"
58+
curl -f -o config "https://raw.githubusercontent.com/GameServerManagers/Game-Server-Configs/main/${{ matrix.shortname }}/${{ steps.sets-servercfgname.outputs.servercfgname }}"
5859
fi
5960
- name: Display config
6061
run: |

‎.github/workflows/git-sync.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
name: Github to Bitbucket sync
1+
name: Github to Bitbucket Sync
22
# This action will sync the github repo with a backup bitbucket repo.
33
# This will allow LinuxGSM to use Bitbucket as and alternative download if github fails.
44
on:
55
push:
66
branches:
77
- master
88
- develop
9+
910
jobs:
10-
GitHub-to-Bitbucket:
11+
gitHub-to-bitbucket:
1112
runs-on: ubuntu-latest
1213
steps:
13-
- name: webfactory/ssh-agent@v0.8.0
14+
- name: SSH Agent
1415
uses: webfactory/ssh-agent@v0.8.0
1516
with:
1617
ssh-private-key: ${{ secrets.BITBUCKET_SECRET }}
1718

18-
- name: wei/git-sync@v3.0.0
19+
- name: Git Sync
1920
uses: wei/git-sync@v3.0.0
2021
with:
2122
ssh_private_key: ${{ secrets.BITBUCKET_SECRET }}

‎.github/workflows/label-sponsors.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎.github/workflows/labeler.yml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,30 @@
1-
name: "Issue Labeler"
1+
name: Issue Labeler
22
on:
33
issues:
4-
types: [opened, edited]
5-
pull_request:
6-
types: [opened, edited]
4+
types:
5+
- opened
6+
- edited
77

88
permissions:
9+
issues: write
910
contents: read
1011

1112
jobs:
12-
triage:
13-
permissions:
14-
contents: read # for github/issue-labeler to get repo contents
15-
issues: write # for github/issue-labeler to create or remove labels
13+
issue-labeler:
1614
runs-on: ubuntu-latest
1715
steps:
18-
- uses: github/issue-labeler@v3.1
16+
- name: Issue Labeler
17+
uses: github/issue-labeler@v3.1
1918
with:
2019
repo-token: "${{ secrets.GITHUB_TOKEN }}"
2120
configuration-path: .github/labeler.yml
22-
not-before:
2321
enable-versioned-regex: 0
2422
include-title: 1
23+
24+
is-sponsor-label:
25+
runs-on: ubuntu-latest
26+
steps:
27+
- name: Is Sponsor Label
28+
uses: JasonEtco/is-sponsor-label-action@v2
29+
env:
30+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/lock.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
1-
name: "Lock Threads"
2-
1+
name: Lock Threads
32
on:
43
schedule:
5-
- cron: "0 0 * * *"
4+
- cron: "0 0 * * 1"
65

76
permissions:
8-
contents: read
7+
issues: write
8+
pull-requests: write
99

1010
jobs:
1111
lock:
12-
permissions:
13-
issues: write # for dessant/lock-threads to lock issues
14-
pull-requests: write # for dessant/lock-threads to lock PRs
1512
runs-on: ubuntu-latest
1613
steps:
17-
- uses: dessant/lock-threads@v4
14+
- name: Lock Threads
15+
uses: dessant/lock-threads@v4
1816
with:
1917
github-token: ${{ secrets.GITHUB_TOKEN }}
2018
issue-comment: >

‎.github/workflows/potential-duplicates.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,21 @@
11
name: Potential Duplicates
22
on:
33
issues:
4-
types: [opened]
4+
types:
5+
- opened
56
jobs:
6-
run:
7+
potential-duplicates:
78
runs-on: ubuntu-latest
89
steps:
9-
- uses: wow-actions/potential-duplicates@v1
10+
- name: Potential Duplicates
11+
uses: wow-actions/potential-duplicates@v1
1012
with:
1113
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
12-
# Issue title filter work with anymatch https://www.npmjs.com/package/anymatch.
13-
# Any matched issue will stop detection immediately.
14-
# You can specify multi filters in each line.
1514
filter: ""
16-
# Exclude keywords in title before detecting.
1715
exclude: ""
18-
# Label to set, when potential duplicates are detected.
1916
label: potential-duplicate
20-
# Get issues with state to compare. Supported state: 'all', 'closed', 'open'.
2117
state: all
22-
# If similarity is higher than this threshold([0,1]), issue will be marked as duplicate.
2318
threshold: 0.8
24-
# Reactions to be add to comment when potential duplicates are detected.
25-
# Available reactions: "-1", "+1", "confused", "laugh", "heart", "hooray", "rocket", "eyes"
26-
#reactions: 'eyes, confused'
27-
# Comment to post when potential duplicates are detected.
2819
comment: >
2920
Potential duplicates: {{#issues}}
3021
- [#{{ number }}] {{ title }} ({{ accuracy }}%)

‎.github/workflows/serverlist-validate.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Server list Validation
1+
name: Server List Validation
22
on:
33
workflow_dispatch:
44
push:
@@ -7,7 +7,8 @@ jobs:
77
serverlist-validate:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3
10+
- name: Checkout
11+
uses: actions/checkout@v3
1112

12-
- name: compare versions
13+
- name: Compare Versions
1314
run: chmod +x .github/workflows/serverlist-validate.sh; .github/workflows/serverlist-validate.sh

‎.github/workflows/trigger-docker-build.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,24 @@ on:
33
release:
44
types:
55
- published
6+
67
jobs:
78
trigger_build_docker-linuxgsm:
8-
name: Trigger Build docker-linuxgsm
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: convictional/trigger-workflow-and-wait@v1.6.5
11+
- name: Trigger Workflow and Wait (linuxgsm)
12+
uses: convictional/trigger-workflow-and-wait@v1.6.5
1213
with:
1314
owner: GameServerManagers
1415
repo: docker-linuxgsm
1516
github_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
1617
workflow_file_name: docker-publish.yml
1718

1819
trigger_build_docker-gameserver:
19-
name: Trigger Build docker-linuxgsm
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: convictional/trigger-workflow-and-wait@v1.6.5
22+
- name: Trigger Workflow and Wait (gameserver)
23+
uses: convictional/trigger-workflow-and-wait@v1.6.5
2324
with:
2425
owner: GameServerManagers
2526
repo: docker-gameserver

‎.github/workflows/update-copyright-years-in-license-file.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
---
21
name: Update copyright year(s) in license file
3-
42
on:
53
workflow_dispatch:
64
schedule:
@@ -10,10 +8,12 @@ jobs:
108
update-license-year:
119
runs-on: ubuntu-latest
1210
steps:
13-
- uses: actions/checkout@v3
11+
- name: Checkout
12+
uses: actions/checkout@v3
1413
with:
1514
fetch-depth: 0
16-
- uses: FantasticFiasco/action-update-license-year@v3
15+
- name: Action Update License Year
16+
uses: FantasticFiasco/action-update-license-year@v3
1717
with:
1818
token: ${{ secrets.GITHUB_TOKEN }}
1919
path: LICENSE.md

0 commit comments

Comments
 (0)