test both ubuntu and arch builds

skyrim-multiplayer · Dec 22, 2024 · 7f304f4 · 7f304f4
1 parent 9306d3b
commit 7f304f4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/pr-ubuntu-docker.yml b/.github/workflows/pr-ubuntu-docker.yml
@@ -23,7 +23,7 @@ jobs:
             # - ubuntu-2204
             # - ubuntu-2404
             # - debian
-            # - archlinux
+            - archlinux
         runs-on: ubuntu-latest
         steps:
           - name: Checkout

diff --git a/build.sh b/build.sh
@@ -15,9 +15,15 @@ fi
 
 export VCPKG_DISABLE_METRICS=1
 
-export CC=/usr/bin/clang
-export CPP=/usr/bin/clang-cpp
-export CXX=/usr/bin/clang++
+if which clang++ >& /dev/null; then
+  export CC=/usr/bin/clang
+  export CPP=/usr/bin/clang-cpp
+  export CXX=/usr/bin/clang++
+else
+  export CC=/usr/bin/clang-15
+  export CPP=/usr/bin/clang-cpp-15
+  export CXX=/usr/bin/clang++-15
+fi
 # export LD=/usr/bin/ld.lld-15
 
 # export CMAKE_C_COMPILER="$CC"