switch back to linux. Try llvmpipe LP_NUM_THREADS

rectalogic · Dec 11, 2023 · bf8dc23 · bf8dc23
1 parent aca1666
commit bf8dc23
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,15 +7,12 @@ on:
 jobs:
 
   linux:
-    runs-on: macos-12
+    runs-on: ubuntu-22.04
     steps:
     - name: Checkout
       uses: actions/checkout@v4
       with:
         submodules: true
-    - name: Setup docker
-      run: |
-        brew install docker && colima start
     - name: Setup buildx
       uses: docker/setup-buildx-action@v3
     - name: Build mediafx image
@@ -25,17 +22,17 @@ jobs:
         tags: mediafx
         load: true
         target: mediafx
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
+        cache-from: type=registry,ref=ghcr.io/${{ github.repository }}:buildcache
+        cache-to: type=registry,ref=ghcr.io/${{ github.repository }}:buildcache,mode=max
     - name: Build mediafx-vulkan image
       uses: docker/build-push-action@v5
       with:
         context: builders/Linux
         tags: mediafx-vulkan
         load: true
         target: mediafx-vulkan  
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
+        cache-from: type=registry,ref=ghcr.io/${{ github.repository }}:buildcache
+        cache-to: type=registry,ref=ghcr.io/${{ github.repository }}:buildcache,mode=max
     - name: Install mediaFX
       run: sudo rm -rf build/Linux && DOCKER_OPTS="-e MEDIAFX_TEST=" builders/Linux/docker-run.sh /mediafx/builders/Linux/mediafx-build.sh
     - name: Install mediaFX vulkan

diff --git a/builders/Linux/mediafx-build.sh b/builders/Linux/mediafx-build.sh
@@ -17,5 +17,6 @@
 cd "$(dirname "${BASH_SOURCE[0]}")/../../build/Linux" || exit 1
 (cmake --install-prefix /usr/local/Qt/${QT_VER:?}/gcc_64 ../.. && cmake --build . && sudo cmake --install .) || exit 1
 if [[ -v MEDIAFX_TEST ]]; then
+    export LP_NUM_THREADS=2
     make test CTEST_OUTPUT_ON_FAILURE=1 ARGS="${MEDIAFX_TEST}" || exit 1
 fi