diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2a58254..5415d3e 100644 --- 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,8 +22,8 @@ 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: @@ -34,8 +31,8 @@ jobs: 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 index e935a82..308b91d 100755 --- 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 \ No newline at end of file