Merge pull request #242 from muttleyxd/fix-dayz-launcher

fix dayz launcher
muttleyxd · Jan 8, 2023 · 018ce55 · 018ce55
2 parents 4c06ead + 5e9dc90
commit 018ce55
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 1 deletion.
diff --git a/.github/workflows/linux_packages.yml b/.github/workflows/linux_packages.yml
@@ -61,3 +61,29 @@ jobs:
       with:
         file: "*.AppImage"
         draft: true
+  dayz-appimage-gcc-8:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Set permissions
+      run: chmod 777 ${{ github.workspace }}
+    - name: Run the build process with Docker
+      uses: addnab/docker-run-action@v3
+      with:
+        image: muttleyxd/a3ul_appimage_build:latest
+        options: -v ${{ github.workspace }}:/github/workspace
+        run: |
+             set -eux
+             cd /github/workspace
+             tools/ci/packaging/appimage_dayz/build.sh /github/workspace /tmp/build /tmp/build
+             cp /tmp/build/*.AppImage /github/workspace
+    - name: draft release
+      if: github.ref == 'refs/heads/master'
+      uses: xresloader/upload-to-github-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.actionrelease }}
+      with:
+        file: "*.AppImage"
+        draft: true
diff --git a/.github/workflows/linux_test_builds.yml b/.github/workflows/linux_test_builds.yml
@@ -67,3 +67,18 @@ jobs:
              cmake /github/workspace -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS="-Werror" -DRUN_TESTS=ON -DDEVELOPER_MODE=ON -DRUN_TESTS_FUZZING=ON -DRUN_TESTS_UNIT=OFF
              make -j$(nproc)
              ctest --output-on-failure || ls | grep crash | xargs -n1 cat
+  dayz-archlinux-gcc:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run the build process with Docker
+      uses: addnab/docker-run-action@v3
+      with:
+        image: muttleyxd/a3ul_archlinux_build:latest
+        options: -v ${{ github.workspace }}:/github/workspace
+        run: |
+             set -euxo pipefail
+             mkdir /tmp/build && cd /tmp/build
+             cmake /github/workspace -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-Werror" -DRUN_TESTS=ON -DDEVELOPER_MODE=ON -DBUILD_DAYZ_LAUNCHER=ON
+             make -j$(nproc)
+             ctest -V
diff --git a/src/dayz-linux-launcher/main.cpp b/src/dayz-linux-launcher/main.cpp
@@ -148,7 +148,7 @@ int main(int argc, char *argv[])
                         arma_path = steam.GetGamePathFromInstallPath(path, DayZ::Definitions::app_id);
                         try
                         {
-                            workshop_path = steam.GetWorkshopPath(path, ARMA3::Definitions::app_id);
+                            workshop_path = steam.GetWorkshopPath(path, DayZ::Definitions::app_id);
                         }
                         catch (std::exception const &e) // todo: write macro for this? ex. TRY()
                         {