From 1391332e6c73e593efd17c8718cd1041a5c863cc Mon Sep 17 00:00:00 2001
From: Alejandro Saucedo <axsauze@gmail.com>
Date: Sun, 24 Jan 2021 14:25:54 +0000
Subject: [PATCH] Added job with builder image

---
 .github/workflows/cpp_ubuntu.yml | 39 +++++++++++---------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/cpp_ubuntu.yml b/.github/workflows/cpp_ubuntu.yml
index 82c5706d8..33586631e 100644
--- a/.github/workflows/cpp_ubuntu.yml
+++ b/.github/workflows/cpp_ubuntu.yml
@@ -10,38 +10,25 @@ jobs:
   build-ubuntu:
 
     runs-on: ubuntu-18.04
-    
+    container: axsauze/kompute-builder:0.1
+
     steps:
     - uses: actions/checkout@v2
       with:
         submodules: recursive
-    - name: Install Dependencies
-      run: |
-        sudo apt-get install libvulkan-dev
-        #swiftshader vulkan cpu implementation
-        sudo wget https://www.dropbox.com/s/d0weho6l8dovm71/libvk_swiftshader.so?dl=1 -O /usr/lib/libvk_swiftshader.so
-        sudo mkdir -p /usr/share/vulkan/icd.d
-        sudo wget https://www.dropbox.com/s/5oly49ev3vvcfdu/vk_swiftshader_icd.json?dl=1 -O /usr/share/vulkan/icd.d/vk_swiftshader_icd.json
     - name: configure
       run: |
-        cmake . -Bbuild/ \
-                  -DKOMPUTE_OPT_BUILD_TESTS=1                \
-                  -DKOMPUTE_OPT_INSTALL=1                    \
-                  -DKOMPUTE_OPT_ENABLE_SPDLOG=1              \
-                  -DSPDLOG_INSTALL=1                         \
+        cmake -Bbuild/ \
+                  -DKOMPUTE_OPT_INSTALL=0                    \
                   -DKOMPUTE_OPT_REPO_SUBMODULE_BUILD=1       \
-                  -DKOMPUTE_OPT_BUILD_TESTS=1
+                  -DKOMPUTE_OPT_BUILD_TESTS=1                \
+                  -DKOMPUTE_OPT_ENABLE_SPDLOG=1              \
+                  -DSPDLOG_INSTALL=1
     - name: build
-      run: | 
-        make -C build/ -j
-    - name: tests
       run: |
-        # Only running tests that dont require GLSL compilation
-        ./build/test/test_kompute --gtest_filter="TestLogisticRegressionAlgorithm.*"
-        ./build/test/test_kompute --gtest_filter="TestManager.*"
-        ./build/test/test_kompute --gtest_filter="TestOpAlgoBase.ShaderCompiledDataFromConstructor"
-        ./build/test/test_kompute --gtest_filter="TestOpTensorCopy.*"
-        ./build/test/test_kompute --gtest_filter="TestOpTensorCreate.*"
-        ./build/test/test_kompute --gtest_filter="TestOpTensorSync.*"
-        ./build/test/test_kompute --gtest_filter="TestSequence.*"
-        ./build/test/test_kompute --gtest_filter="TestTensor.*"
+        make mk_build_tests
+    - name: test
+      run: |
+        export VK_ICD_FILENAMES=/swiftshader/vk_swiftshader_icd.json
+        make mk_run_tests_cpu_only
+