From 550d28693bda062541422a7388374328b036d975 Mon Sep 17 00:00:00 2001 From: kushalkolar Date: Fri, 18 Oct 2024 02:21:50 -0400 Subject: [PATCH 1/4] try adding mac to ci --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00310cf37..a5ef3f9ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,13 +72,11 @@ jobs: examples/notebooks/diffs test-build-desktop: - name: Test Linux, only offscreen - runs-on: ubuntu-latest - timeout-minutes: 10 - if: ${{ !github.event.pull_request.draft }} + name: Test only offscreen strategy: fail-fast: false matrix: + os: [ubuntu-latest, macos-latest] include: - name: Test py310 pyversion: '3.10' @@ -86,6 +84,9 @@ jobs: pyversion: '3.11' - name: Test py312 pyversion: '3.12' + runs-on: ${{ matrix.os }} + timeout-minutes: 10 + if: ${{ !github.event.pull_request.draft }} steps: - name: Install git-lfs run: | From 220c27d4c3b519297def55290920402cbe3dbb72 Mon Sep 17 00:00:00 2001 From: kushalkolar Date: Fri, 18 Oct 2024 02:31:11 -0400 Subject: [PATCH 2/4] run apt stuff only on linux --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5ef3f9ea..b77f61ec6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,16 +97,16 @@ jobs: with: python-version: ${{ matrix.pyversion }} - name: Install llvmpipe and lavapipe for offscreen canvas + if: runner.os == 'Linux' run: | sudo apt-get update -y -qq sudo apt-get install --no-install-recommends -y libegl1-mesa-dev libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers git-lfs - name: Install dev dependencies run: | python -m pip install --upgrade pip setuptools - # remove pygfx from install_requires, we install using pygfx@main - sed -i "/pygfx/d" ./setup.py - pip install git+https://github.com/pygfx/pygfx.git@main pip install -e ".["tests-desktop"]" + # install latest pygfx from main + pip install -U git+https://github.com/pygfx/pygfx.git@main - name: Show wgpu backend run: python -c "from examples.tests.testutils import wgpu_backend; print(wgpu_backend)" From 822a57579549b9b903371afa872f6e1163c43296 Mon Sep 17 00:00:00 2001 From: kushalkolar Date: Fri, 18 Oct 2024 02:33:24 -0400 Subject: [PATCH 3/4] with lfs true --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b77f61ec6..bf80f28f9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,10 +88,9 @@ jobs: timeout-minutes: 10 if: ${{ !github.event.pull_request.draft }} steps: - - name: Install git-lfs - run: | - sudo apt install --no-install-recommends -y git-lfs - uses: actions/checkout@v4 + with: + lfs: true - name: Set up Python uses: actions/setup-python@v5 with: From 3c10a6fcbe4fcffae59f15a8a205e79db1d332b7 Mon Sep 17 00:00:00 2001 From: kushalkolar Date: Fri, 18 Oct 2024 02:37:40 -0400 Subject: [PATCH 4/4] bring back sed --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf80f28f9..6187367c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,9 +103,10 @@ jobs: - name: Install dev dependencies run: | python -m pip install --upgrade pip setuptools + # remove pygfx from install_requires, we install using pygfx@main + sed -i'' -e "/pygfx/d" ./setup.py + pip install git+https://github.com/pygfx/pygfx.git@main pip install -e ".["tests-desktop"]" - # install latest pygfx from main - pip install -U git+https://github.com/pygfx/pygfx.git@main - name: Show wgpu backend run: python -c "from examples.tests.testutils import wgpu_backend; print(wgpu_backend)"