Fix linux build

rehlds · Jul 14, 2024 · 75dc5b8 · 75dc5b8
1 parent 30572ef
commit 75dc5b8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,12 +25,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup MSBuild
-        uses: microsoft/setup-msbuild@v1.1.3
+        uses: microsoft/setup-msbuild@v2
         with:
           vs-version: '16.8'
 
@@ -58,7 +58,7 @@ jobs:
           move msvc\${{ env.buildRelease }}\mp.pdb publish\debug\mp.pdb
 
       - name: Deploy artifacts
-        uses: actions/upload-artifact@v3.1.1
+        uses: actions/upload-artifact@v4
         with:
           name: win32
           path: publish/*
@@ -80,7 +80,7 @@ jobs:
 
     steps:
       - name: Deploying windows artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v2
         with:
           name: win32
 
@@ -136,7 +136,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: true
@@ -150,7 +150,7 @@ jobs:
 
       - name: Build and Run unittests
         run: |
-          rm -rf build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Unittests -B build && cmake --build build -j8
+          rm -rf build && CC=clang CXX=clang++ cmake -DUSE_STATIC_LIBSTDC=ON -DCMAKE_BUILD_TYPE=Unittests -B build && cmake --build build -j8
           retVal=0
           ./build/regamedll/cs 2> /dev/null > result.log || retVal=$?
           while read line; do
@@ -173,7 +173,7 @@ jobs:
 
       - name: Build using Clang C++ Compiler
         run: |
-          rm -rf build && CC=clang CXX=clang++ cmake -B build && cmake --build build -j8
+          rm -rf build && CC=clang CXX=clang++ cmake -DUSE_STATIC_LIBSTDC=ON -B build && cmake --build build -j8
 
       - name: Prepare CSSDK
         run: |
@@ -199,7 +199,7 @@ jobs:
         shell: bash
 
       - name: Deploy artifacts
-        uses: actions/upload-artifact@v3.1.1
+        uses: actions/upload-artifact@v4
         id: upload-job
         with:
           name: linux32
@@ -213,17 +213,17 @@ jobs:
 
   publish:
     name: 'Publish'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [windows, testdemos, linux]
 
     steps:
       - name: Deploying linux artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v6
         with:
           name: linux32
 
       - name: Deploying windows artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v6
         with:
           name: win32
 
@@ -253,7 +253,7 @@ jobs:
           7z a -tzip regamedll-bin-${{ env.APP_VERSION }}.zip bin/ cssdk/
 
       - name: Publish artifacts
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         id: publish-job
         if: |
           startsWith(github.ref, 'refs/tags/') &&

diff --git a/regamedll/CMakeLists.txt b/regamedll/CMakeLists.txt
@@ -365,7 +365,6 @@ target_sources(regamedll PRIVATE
 target_link_libraries(regamedll PRIVATE
 	dl
 	aelf32
-
 	$<$<CONFIG:Unittests>:cppunitlite>
 )