Skip to content

Commit 94da7b5

Browse files
authored
Merge branch 'dev' into Item_move_fix
2 parents 6508656 + 06de4e2 commit 94da7b5

41 files changed

Lines changed: 940 additions & 343 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
## Description
2+
3+
Please provide a clear description of the changes included in this pull request.
4+
5+
Explain:
6+
7+
* What problem this PR solves
8+
* Why the change is necessary / wanted
9+
* Any relevant context or background
10+
11+
---
12+
13+
## Type of Change
14+
15+
Please check the relevant option:
16+
17+
* [ ] Bug fix
18+
* [ ] New feature
19+
* [ ] Performance improvement
20+
* [ ] Refactoring
21+
* [ ] Documentation update
22+
* [ ] Build / CI change
23+
* [ ] Other (please describe)
24+
25+
---
26+
27+
## Related Issues
28+
29+
Link any related issues or pull requests here.
30+
31+
Example:
32+
Fixes #123
33+
Related to #456
34+
35+
---
36+
37+
## Testing
38+
39+
Before submitting, please test you changes accordingly. Check the list bellow:
40+
41+
* Tested on a clean SphereServer instance with latest ScriptPack
42+
* No regressions in existing functionality
43+
* Added or updated tests (if applicable)
44+
45+
---
46+
47+
## Checklist
48+
49+
Please confirm the following before submitting:
50+
51+
* [ ] Code compiles successfully
52+
* [ ] Changes follow the project's coding style
53+
* [ ] No unrelated code was modified
54+
* [ ] Documentation updated where necessary
55+
* [ ] This PR does not introduce breaking changes (or they are documented)
56+
57+
---
58+
59+
## Additional Notes
60+
61+
Add any other information reviewers should know.

.github/workflows/build_linux_x86.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ jobs:
119119
120120
# Upload artifact linked to the workflow run - only if the run is for a pull request, or for selected branches
121121
- name: Upload artifact
122-
if: contains(fromJson('["master", "main", "dev"]'), github.ref_name) || ${{ github.event_name == 'pull_request' }}
123-
uses: actions/upload-artifact@v4
122+
if: contains(fromJson('["master", "main", "dev"]'), github.ref_name) || github.event_name == 'pull_request'
123+
uses: actions/upload-artifact@v7
124124
env:
125125
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
126126
with:
@@ -134,13 +134,13 @@ jobs:
134134
# Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches
135135
if: contains(fromJson('["master", "main"]'), github.ref_name)
136136
permissions:
137-
contents: read
138-
actions: write
137+
contents: write
138+
actions: read
139139

140140
runs-on: ubuntu-latest
141141
steps:
142142
- name: Download builds
143-
uses: actions/download-artifact@v5
143+
uses: actions/download-artifact@v8
144144
with:
145145
name: Build-linux-x86
146146
merge-multiple: true
@@ -167,11 +167,12 @@ jobs:
167167
runs-on: ubuntu-latest
168168
steps:
169169
- name: Download builds
170-
uses: actions/download-artifact@v5
170+
uses: actions/download-artifact@v8
171171
with:
172172
name: Build-linux-x86
173173
merge-multiple: true
174174
run-id: ${{ github.run_id }}
175175
- name: Push release
176176
run: |
177177
curl -sST "{SphereSvrX-linux-x86-nightly.tar.gz}" -u ${{secrets.UP_USER}}:${{secrets.UP_PASS}} ${{secrets.UP_WHERE}}
178+
curl -sST "{SphereSvrX-linux-x86-nightly.tar.gz}" --ftp-pasv --ssl --ssl-reqd -u '${{secrets.FTP_USER}}:${{secrets.FTP_PASS}}' ${{secrets.FTP_LOC}}/release/prod/

.github/workflows/build_linux_x86_64.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,28 +74,27 @@ jobs:
7474
7575
# Upload artifact linked to the workflow run - only if the run is for a pull request, or for selected branches
7676
- name: Upload artifact
77-
if: contains(fromJson('["master", "main", "dev"]'), github.ref_name) || ${{ github.event_name == 'pull_request' }}
78-
uses: actions/upload-artifact@v4
77+
if: contains(fromJson('["master", "main", "dev"]'), github.ref_name) || github.event_name == 'pull_request'
78+
uses: actions/upload-artifact@v7
7979
env:
8080
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8181
with:
8282
name: Build-linux-x86_64
8383
path: SphereSvrX-linux-x86_64-nightly.tar.gz
8484
overwrite: true
8585

86-
8786
upload_github_release:
8887
needs: linux-x86_64
8988
# Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches
9089
if: contains(fromJson('["master", "main"]'), github.ref_name)
9190
permissions:
92-
contents: read
93-
actions: write
91+
contents: write
92+
actions: read
9493

9594
runs-on: ubuntu-latest
9695
steps:
9796
- name: Download builds
98-
uses: actions/download-artifact@v5
97+
uses: actions/download-artifact@v8
9998
with:
10099
name: Build-linux-x86_64
101100
merge-multiple: true
@@ -121,11 +120,12 @@ jobs:
121120
runs-on: ubuntu-latest
122121
steps:
123122
- name: Download builds
124-
uses: actions/download-artifact@v5
123+
uses: actions/download-artifact@v8
125124
with:
126125
name: Build-linux-x86_64
127126
merge-multiple: true
128127
run-id: ${{ github.run_id }}
129128
- name: Push release
130129
run: |
131130
curl -sST "{SphereSvrX-linux-x86_64-nightly.tar.gz}" -u ${{secrets.UP_USER}}:${{secrets.UP_PASS}} ${{secrets.UP_WHERE}}
131+
curl -sST "{SphereSvrX-linux-x86_64-nightly.tar.gz}" --ftp-pasv --ssl --ssl-reqd -u '${{secrets.FTP_USER}}:${{secrets.FTP_PASS}}' ${{secrets.FTP_LOC}}/release/prod/
Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
name: Linux x86_64_deb
2+
3+
on:
4+
push:
5+
# branches:
6+
# - 'master'
7+
# - 'main'
8+
paths-ignore:
9+
- '.gitignore'
10+
- '.gitattributes'
11+
- '**.txt'
12+
- '**.md'
13+
- '**.rc'
14+
pull_request:
15+
branches:
16+
- 'master'
17+
- 'main'
18+
19+
jobs:
20+
linux-x86_64_deb:
21+
runs-on: ubuntu-24.04
22+
permissions:
23+
contents: read
24+
actions: read
25+
26+
steps:
27+
- name: Checkout repository
28+
uses: actions/checkout@v5
29+
with:
30+
fetch-depth: 0
31+
- name: Install prerequisites
32+
run: |
33+
lsb_release -d
34+
35+
sudo add-apt-repository universe && sudo sudo apt-get -qq update
36+
sudo apt-get install -yq --no-install-recommends \
37+
ninja-build gcc-12 g++-12 \
38+
dpkg-dev debhelper-compat build-essential \
39+
mariadb-client libmariadb-dev
40+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 90 --slave /usr/bin/g++ g++ /usr/bin/g++-12
41+
42+
- name: Report building tools
43+
run: |
44+
echo "GCC:" && gcc -v
45+
echo "Default Linker:" && ld -v
46+
echo && echo "CMake:" && cmake --version
47+
echo && echo "Ninja:" && ninja --version
48+
49+
- name: Create package
50+
run: |
51+
cd packaging
52+
cat debian/data/changelog | sed -e "s/@version@/$(git rev-list --count HEAD)/" -e "s/@date@/$(date -R)/" > debian/changelog
53+
dpkg-buildpackage -us -uc -b -d
54+
mv ../sphereserver_0.X.nightly-$(git rev-list --count HEAD)_amd64.deb ../SphereSvrX-linux-x86_64-nightly.deb
55+
56+
# Upload artifact linked to the workflow run - only if the run is for a pull request, or for selected branches
57+
- name: Upload artifact
58+
if: contains(fromJson('["master", "main"]'), github.ref_name) || github.event_name == 'pull_request'
59+
uses: actions/upload-artifact@v7
60+
env:
61+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
62+
with:
63+
name: Build-linux-x86_64_deb
64+
path: SphereSvrX-linux-x86_64-nightly.deb
65+
overwrite: true
66+
67+
upload_github_release:
68+
needs: linux-x86_64_deb
69+
# Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches
70+
if: contains(fromJson('["master", "main"]'), github.ref_name)
71+
permissions:
72+
contents: write
73+
actions: read
74+
75+
runs-on: ubuntu-latest
76+
steps:
77+
- name: Download builds
78+
uses: actions/download-artifact@v8
79+
with:
80+
name: Build-linux-x86_64_deb
81+
merge-multiple: true
82+
run-id: ${{ github.run_id }}
83+
84+
- name: Create release
85+
uses: softprops/action-gh-release@v2
86+
env:
87+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
88+
with:
89+
name: Nightly
90+
tag_name: Nightly
91+
prerelease: true
92+
files: SphereSvrX-linux-x86_64-nightly.deb
93+
fail_on_unmatched_files: false
94+
95+
upload_selfhost_release:
96+
needs: linux-x86_64_deb
97+
if: contains(fromJson('["master", "main"]'), github.ref_name) && (github.repository == 'SphereServer/Source-X')
98+
permissions:
99+
contents: write
100+
actions: read
101+
102+
runs-on: ubuntu-latest
103+
steps:
104+
- name: Download builds
105+
uses: actions/download-artifact@v8
106+
with:
107+
name: Build-linux-x86_64_deb
108+
merge-multiple: true
109+
run-id: ${{ github.run_id }}
110+
- name: Push release
111+
run: |
112+
curl -sST "{SphereSvrX-linux-x86_64-nightly.deb}" -u ${{secrets.UP_USER}}:${{secrets.UP_PASS}} ${{secrets.UP_WHERE}}
113+
curl -sST "{SphereSvrX-linux-x86_64-nightly.deb}" --ftp-pasv --ssl --ssl-reqd -u '${{secrets.FTP_USER}}:${{secrets.FTP_PASS}}' ${{secrets.FTP_LOC}}/release/prod/

.github/workflows/build_osx_arm.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ jobs:
6565
6666
# Upload artifact linked to the workflow run - only if the run is for a pull request, or for selected branches
6767
- name: Upload artifact
68-
if: contains(fromJson('["master", "main", "dev"]'), github.ref_name) || ${{ github.event_name == 'pull_request' }}
69-
uses: actions/upload-artifact@v4
68+
if: contains(fromJson('["master", "main", "dev"]'), github.ref_name) || github.event_name == 'pull_request'
69+
uses: actions/upload-artifact@v7
7070
env:
7171
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7272
with:
@@ -79,13 +79,13 @@ jobs:
7979
needs: macos-arm64 # Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches
8080
if: contains(fromJson('["master", "main"]'), github.ref_name)
8181
permissions:
82-
contents: read
83-
actions: write
82+
contents: write
83+
actions: read
8484

8585
runs-on: ubuntu-latest
8686
steps:
8787
- name: Download builds
88-
uses: actions/download-artifact@v5
88+
uses: actions/download-artifact@v8
8989
with:
9090
name: Build-osx-arm64
9191
merge-multiple: true
@@ -112,11 +112,12 @@ jobs:
112112
runs-on: ubuntu-latest
113113
steps:
114114
- name: Download builds
115-
uses: actions/download-artifact@v5
115+
uses: actions/download-artifact@v8
116116
with:
117117
name: Build-osx-arm64
118118
merge-multiple: true
119119
run-id: ${{ github.run_id }}
120120
- name: Push release
121121
run: |
122122
curl -sST "{SphereSvrX-osx-arm64-nightly.zip}" -u ${{secrets.UP_USER}}:${{secrets.UP_PASS}} ${{secrets.UP_WHERE}}
123+
curl -sST "{SphereSvrX-osx-arm64-nightly.zip}" --ftp-pasv --ssl --ssl-reqd -u '${{secrets.FTP_USER}}:${{secrets.FTP_PASS}}' ${{secrets.FTP_LOC}}/release/prod/

.github/workflows/build_osx_x86_64.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ jobs:
6363
6464
# Upload artifact linked to the workflow run - only if the run is for a pull request, or for selected branches
6565
- name: Upload artifact
66-
if: contains(fromJson('["master", "main", "dev"]'), github.ref_name) || ${{ github.event_name == 'pull_request' }}
67-
uses: actions/upload-artifact@v4
66+
if: contains(fromJson('["master", "main", "dev"]'), github.ref_name) || github.event_name == 'pull_request'
67+
uses: actions/upload-artifact@v7
6868
env:
6969
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7070
with:
@@ -75,16 +75,16 @@ jobs:
7575
upload_github_release:
7676
needs: macos-x86_64
7777
permissions:
78-
contents: read
79-
actions: write
78+
contents: write
79+
actions: read
8080

8181
# Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches
8282
if: contains(fromJson('["master", "main"]'), github.ref_name)
8383

8484
runs-on: ubuntu-latest
8585
steps:
8686
- name: Download builds
87-
uses: actions/download-artifact@v5
87+
uses: actions/download-artifact@v8
8888
with:
8989
name: Build-osx-x86_64
9090
merge-multiple: true
@@ -110,11 +110,12 @@ jobs:
110110
runs-on: ubuntu-latest
111111
steps:
112112
- name: Download builds
113-
uses: actions/download-artifact@v5
113+
uses: actions/download-artifact@v8
114114
with:
115115
name: Build-osx-x86_64
116116
merge-multiple: true
117117
run-id: ${{ github.run_id }}
118118
- name: Push release
119119
run: |
120120
curl -sST "{SphereSvrX-osx-x86_64-nightly.zip}" -u ${{secrets.UP_USER}}:${{secrets.UP_PASS}} ${{secrets.UP_WHERE}}
121+
curl -sST "{SphereSvrX-osx-x86_64-nightly.zip}" --ftp-pasv --ssl --ssl-reqd -u '${{secrets.FTP_USER}}:${{secrets.FTP_PASS}}' ${{secrets.FTP_LOC}}/release/prod/

.github/workflows/build_win_x86.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ jobs:
4545
4646
# Upload artifact linked to the workflow run - only if the run is for a pull request, or for selected branches
4747
- name: Upload artifact
48-
if: contains(fromJson('["master", "main", "dev"]'), github.ref_name) || ${{ github.event_name == 'pull_request' }}
49-
uses: actions/upload-artifact@v4
48+
if: contains(fromJson('["master", "main", "dev"]'), github.ref_name) || github.event_name == 'pull_request'
49+
uses: actions/upload-artifact@v7
5050
env:
5151
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5252
with:
@@ -59,13 +59,13 @@ jobs:
5959
# Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches
6060
if: contains(fromJson('["master", "main"]'), github.ref_name)
6161
permissions:
62-
contents: read
63-
actions: write
62+
contents: write
63+
actions: read
6464

6565
runs-on: ubuntu-latest
6666
steps:
6767
- name: Download builds
68-
uses: actions/download-artifact@v5
68+
uses: actions/download-artifact@v8
6969
with:
7070
name: Build-win-x86
7171
merge-multiple: true
@@ -91,11 +91,12 @@ jobs:
9191
runs-on: ubuntu-latest
9292
steps:
9393
- name: Download builds
94-
uses: actions/download-artifact@v5
94+
uses: actions/download-artifact@v8
9595
with:
9696
name: Build-win-x86
9797
merge-multiple: true
9898
run-id: ${{ github.run_id }}
9999
- name: Push release
100100
run: |
101101
curl -sST "{SphereSvrX-win-x86-nightly.zip}" -u ${{secrets.UP_USER}}:${{secrets.UP_PASS}} ${{secrets.UP_WHERE}}
102+
curl -sST "{SphereSvrX-win-x86-nightly.zip}" --ftp-pasv --ssl --ssl-reqd -u '${{secrets.FTP_USER}}:${{secrets.FTP_PASS}}' ${{secrets.FTP_LOC}}/release/prod/

0 commit comments

Comments
 (0)