mirror of
https://github.com/alterware/master-server.git
synced 2025-04-19 12:02:53 +00:00
chore: update deps (#117)
This commit is contained in:
parent
ba269b6a63
commit
b5ab843ae1
53
.github/workflows/build.yml
vendored
53
.github/workflows/build.yml
vendored
@ -16,7 +16,7 @@ concurrency:
|
|||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
env:
|
env:
|
||||||
PREMAKE_VERSION: "5.0.0-beta2"
|
PREMAKE_VERSION: "5.0.0-beta6"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-win:
|
build-win:
|
||||||
@ -28,6 +28,9 @@ jobs:
|
|||||||
configuration:
|
configuration:
|
||||||
- debug
|
- debug
|
||||||
- release
|
- release
|
||||||
|
compiler:
|
||||||
|
- msvc
|
||||||
|
- clang
|
||||||
arch:
|
arch:
|
||||||
- x86
|
- x86
|
||||||
- x64
|
- x64
|
||||||
@ -56,26 +59,32 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
version: ${{ env.PREMAKE_VERSION }}
|
version: ${{ env.PREMAKE_VERSION }}
|
||||||
|
|
||||||
- name: Generate project files
|
- name: Generate project files (clang)
|
||||||
|
if: matrix.compiler == 'clang'
|
||||||
|
run: premake5 --cc=${{matrix.compiler}} vs2022
|
||||||
|
|
||||||
|
- name: Generate project files (msvc)
|
||||||
|
if: matrix.compiler == 'msvc'
|
||||||
run: premake5 vs2022
|
run: premake5 vs2022
|
||||||
|
|
||||||
- name: Set up problem matching
|
- name: Set up problem matching
|
||||||
uses: ammaraskar/msvc-problem-matcher@master
|
uses: ammaraskar/msvc-problem-matcher@master
|
||||||
|
|
||||||
- name: Build ${{matrix.arch}} ${{matrix.configuration}} binaries
|
- name: Build ${{matrix.arch}} ${{matrix.configuration}} ${{matrix.compiler}} binaries
|
||||||
run: msbuild /m /v:minimal /p:Configuration=${{matrix.configuration}} /p:Platform=${{matrix.platform}} build/alterware-master.sln
|
run: msbuild /m /p:Configuration=${{matrix.configuration}} /p:Platform=${{matrix.platform}} build/alterware-master.sln
|
||||||
|
|
||||||
- name: Upload ${{matrix.arch}} ${{matrix.configuration}} binaries
|
- name: Upload ${{matrix.arch}} ${{matrix.configuration}} ${{matrix.compiler}} binaries
|
||||||
uses: actions/upload-artifact@main
|
uses: actions/upload-artifact@main
|
||||||
with:
|
with:
|
||||||
name: windows-${{matrix.arch}}-${{matrix.configuration}}
|
name: windows-${{matrix.arch}}-${{matrix.configuration}}-${{matrix.compiler}}
|
||||||
path: |
|
path: |
|
||||||
build/bin/${{matrix.arch}}/${{matrix.configuration}}/alterware-master.exe
|
build/bin/${{matrix.arch}}/${{matrix.configuration}}/alterware-master.exe
|
||||||
build/bin/${{matrix.arch}}/${{matrix.configuration}}/alterware-master.pdb
|
build/bin/${{matrix.arch}}/${{matrix.configuration}}/alterware-master.pdb
|
||||||
|
|
||||||
build-linux:
|
build-linux:
|
||||||
name: Build Linux
|
name: Build Linux
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-latest
|
||||||
|
container: ubuntu:noble
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
@ -86,6 +95,15 @@ jobs:
|
|||||||
- x86
|
- x86
|
||||||
- x64
|
- x64
|
||||||
steps:
|
steps:
|
||||||
|
- name: Install g++ and multilib
|
||||||
|
run: |
|
||||||
|
apt-get update
|
||||||
|
apt-get install -y wget tar git make gcc-13 g++-13 gcc-13-multilib g++-13-multilib
|
||||||
|
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 13
|
||||||
|
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 13
|
||||||
|
update-alternatives --set gcc /usr/bin/gcc-13
|
||||||
|
update-alternatives --set g++ /usr/bin/g++-13
|
||||||
|
|
||||||
- name: Check out files
|
- name: Check out files
|
||||||
uses: actions/checkout@main
|
uses: actions/checkout@main
|
||||||
with:
|
with:
|
||||||
@ -97,9 +115,9 @@ jobs:
|
|||||||
- name: Install dependencies (x86)
|
- name: Install dependencies (x86)
|
||||||
if: matrix.arch == 'x86'
|
if: matrix.arch == 'x86'
|
||||||
run: |
|
run: |
|
||||||
sudo dpkg --add-architecture i386
|
dpkg --add-architecture i386
|
||||||
sudo apt-get update
|
apt-get update
|
||||||
sudo apt-get install gcc-multilib g++-multilib -y
|
apt-get install -y gcc-13-multilib g++-13-multilib
|
||||||
|
|
||||||
- name: Install Premake5
|
- name: Install Premake5
|
||||||
uses: diamante0018/setup-premake@master
|
uses: diamante0018/setup-premake@master
|
||||||
@ -111,7 +129,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Generate project files
|
- name: Generate project files
|
||||||
working-directory: ${{ github.workspace }}
|
working-directory: ${{ github.workspace }}
|
||||||
run: premake5 gmake2
|
run: premake5 gmake
|
||||||
|
|
||||||
- name: Set up problem matching
|
- name: Set up problem matching
|
||||||
uses: ammaraskar/gcc-problem-matcher@master
|
uses: ammaraskar/gcc-problem-matcher@master
|
||||||
@ -119,8 +137,7 @@ jobs:
|
|||||||
- name: Build ${{matrix.arch}} ${{matrix.configuration}} binaries
|
- name: Build ${{matrix.arch}} ${{matrix.configuration}} binaries
|
||||||
working-directory: ${{ github.workspace }}
|
working-directory: ${{ github.workspace }}
|
||||||
run: |
|
run: |
|
||||||
pushd build
|
make -C build config=${{matrix.configuration}}_${{matrix.arch}} -j$(nproc)
|
||||||
make config=${{matrix.configuration}}_${{matrix.arch}} -j$(nproc)
|
|
||||||
|
|
||||||
- name: Upload ${{matrix.arch}} ${{matrix.configuration}} binaries
|
- name: Upload ${{matrix.arch}} ${{matrix.configuration}} binaries
|
||||||
uses: actions/upload-artifact@main
|
uses: actions/upload-artifact@main
|
||||||
@ -156,7 +173,7 @@ jobs:
|
|||||||
version: ${{ env.PREMAKE_VERSION }}
|
version: ${{ env.PREMAKE_VERSION }}
|
||||||
|
|
||||||
- name: Generate project files
|
- name: Generate project files
|
||||||
run: premake5 gmake2
|
run: premake5 gmake
|
||||||
|
|
||||||
- name: Set up problem matching
|
- name: Set up problem matching
|
||||||
uses: ammaraskar/gcc-problem-matcher@master
|
uses: ammaraskar/gcc-problem-matcher@master
|
||||||
@ -231,16 +248,16 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
- name: Setup Docker Buildx
|
- name: Setup Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3.8.0
|
uses: docker/setup-buildx-action@v3.10.0
|
||||||
|
|
||||||
- name: Login to DockerHub
|
- name: Login to DockerHub
|
||||||
uses: docker/login-action@v3.3.0
|
uses: docker/login-action@v3.4.0
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USER }}
|
username: ${{ secrets.DOCKERHUB_USER }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
- id: meta
|
- id: meta
|
||||||
uses: docker/metadata-action@v5.6.1
|
uses: docker/metadata-action@v5.7.0
|
||||||
with:
|
with:
|
||||||
images: |
|
images: |
|
||||||
alterware/master-server
|
alterware/master-server
|
||||||
@ -250,7 +267,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Build and Push Docker Image
|
- name: Build and Push Docker Image
|
||||||
id: build-and-push
|
id: build-and-push
|
||||||
uses: docker/build-push-action@v6.13.0
|
uses: docker/build-push-action@v6.15.0
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
platforms: linux/amd64
|
platforms: linux/amd64
|
||||||
|
2
deps/GSL
vendored
2
deps/GSL
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 355982daf6c54ccb11bef8a1c511be2622dec402
|
Subproject commit 3325bbd33d24d1f8f5a0f69e782c92ad5a39a68e
|
2
deps/libtomcrypt
vendored
2
deps/libtomcrypt
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 54f0456559c8f64b93273a7c71c88a46550eed4e
|
Subproject commit a6b9aff7aab857fe1b491710a5c5b9e2be49cb08
|
2
deps/libtommath
vendored
2
deps/libtommath
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 5938524c60a7168ba5babb3e47b5cd4ee6eadb46
|
Subproject commit e823b0c34cea291bdb94d672731e1c1f08525557
|
2
deps/zlib
vendored
2
deps/zlib
vendored
@ -1 +1 @@
|
|||||||
Subproject commit ef24c4c7502169f016dcd2a26923dbaf3216748c
|
Subproject commit 5a82f71ed1dfc0bec044d9702463dbdf84ea3b71
|
@ -104,7 +104,7 @@ flags {"NoIncrementalLink", "NoMinimalRebuild", "MultiProcessorCompile", "No64Bi
|
|||||||
filter "configurations:release"
|
filter "configurations:release"
|
||||||
optimize "Size"
|
optimize "Size"
|
||||||
defines "NDEBUG"
|
defines "NDEBUG"
|
||||||
flags "FatalCompileWarnings"
|
fatalwarnings {"All"}
|
||||||
filter {}
|
filter {}
|
||||||
|
|
||||||
filter "configurations:debug"
|
filter "configurations:debug"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user