From a4885d5e42f307e976b3b53bb5d2940f06b10586 Mon Sep 17 00:00:00 2001 From: C-Achard Date: Wed, 1 Mar 2023 16:03:45 +0100 Subject: [PATCH] Attempt to fix actions --- .github/workflows/test_and_deploy.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 80a5fa88..0a7f18d6 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -8,6 +8,7 @@ on: branches: - main - npe2 + - cy/interface-overhaul tags: - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10 pull_request: @@ -22,7 +23,7 @@ jobs: runs-on: ${{ matrix.platform }} strategy: matrix: -# platform: [ubuntu-latest, windows-latest, macos-latest] +# platform: [ubuntu-latest, windows-latest, macos-latest] platform: [windows-latest] python-version: [3.8, 3.9, "3.10"] @@ -34,10 +35,10 @@ jobs: with: python-version: ${{ matrix.python-version }} - # these libraries enable testing on Qt on linux +# these libraries enable testing on Qt on linux - uses: tlambert03/setup-qt-libs@v1 - # strategy borrowed from vispy for installing opengl libs on windows +# strategy borrowed from vispy for installing opengl libs on windows - name: Install Windows OpenGL if: runner.os == 'Windows' run: | @@ -45,16 +46,16 @@ jobs: powershell gl-ci-helpers/appveyor/install_opengl.ps1 if (Test-Path -Path "C:\Windows\system32\opengl32.dll" -PathType Leaf) {Exit 0} else {Exit 1} - # note: if you need dependencies from conda, considering using - # setup-miniconda: https://github.com/conda-incubator/setup-miniconda - # and - # tox-conda: https://github.com/tox-dev/tox-conda +# note: if you need dependencies from conda, considering using +# setup-miniconda: https://github.com/conda-incubator/setup-miniconda +# and +# tox-conda: https://github.com/tox-dev/tox-conda - name: Install dependencies run: | python -m pip install --upgrade pip python -m pip install setuptools tox tox-gh-actions - # this runs the platform-specific tests declared in tox.ini +# this runs the platform-specific tests declared in tox.ini - name: Test with tox uses: GabrielBB/xvfb-action@v1 with: @@ -66,9 +67,9 @@ jobs: uses: codecov/codecov-action@v2 deploy: - # this will run when you have tagged a commit, starting with "v*" - # and requires that you have put your twine API key in your - # github secrets (see readme for details) +# this will run when you have tagged a commit, starting with "v*" +# and requires that you have put your twine API key in your +# github secrets (see readme for details) needs: [test] runs-on: ubuntu-latest if: contains(github.ref, 'tags')