Ver Fonte

Try fixing the build

Panagiotis Christopoulos Charitos há 2 anos atrás
pai
commit
de1bf91091
2 ficheiros alterados com 8 adições e 3 exclusões
  1. 5 3
      .github/workflows/Android.yml
  2. 3 0
      .github/workflows/Linux.yml

+ 5 - 3
.github/workflows/Android.yml

@@ -15,14 +15,16 @@ jobs:
     steps:
     - name: Install dependencies
       run: |
-        apt-get update
-        apt install ninja-build
+        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+        sudo apt-get update
+        sudo apt update
+        sudo apt install ninja-build gcc-11 g++-11
 
     - name: Clone
       uses: actions/checkout@v2
 
     - name: Configure CMake for Linux
-      run: cmake -B ${{github.workspace}}/build -DANKI_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DANKI_EXTRA_CHECKS=OFF
+      run: cmake -B ${{github.workspace}}/build -DANKI_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DANKI_EXTRA_CHECKS=OFF -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11
 
     - name: Build Linux ShaderCompiler
       run: cmake --build ${{github.workspace}}/build --config Release --target ShaderCompiler

+ 3 - 0
.github/workflows/Linux.yml

@@ -18,6 +18,9 @@ jobs:
     - name: Clone
       uses: actions/checkout@v2
 
+    - name: DXC
+      run : ${{github.workspace}}/ThirdParty/Bin/Linux64/dxc --version
+
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DANKI_BUILD_TESTS=ON -DCMAKE_CXX_COMPILER=g++ -DCMAKE_C_COMPILER=gcc -DCMAKE_BUILD_TYPE=Debug -DANKI_EXTRA_CHECKS=ON