Fix CI

* Fix changed location of pyrcc5.bat * run windows build without headless gui
Fluorescence-Tools · Sep 20, 2024 · 557a611 · 557a611
1 parent 259150f
commit 557a611
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml
@@ -47,6 +47,7 @@ jobs:
           printenv | sort
 
       - name: Build Conda Package
+        if: matrix.os != 'windows-latest'
         uses: aganders3/headless-gui@v1
         with:
           shell: bash -el {0}
@@ -57,3 +58,10 @@ jobs:
             # curl -sLO  https://raw.githubusercontent.com/conda-forge/conda-forge-pinning-feedstock/084b098a28a7a66e9a0967d156bc55b9ebfc6726/recipe/conda_build_config.yaml
             # curl -sLO https://github.com/conda-forge/conda-forge-pinning-feedstock/raw/main/recipe/conda_build_config.yaml
             conda mambabuild .
+      - name: Build Conda Package on Windows
+        if: matrix.os == 'windows-latest'
+        run: |
+          conda config --add channels tpeulen
+          mamba install conda-build boa
+          cd conda-recipe
+          conda mambabuild .
diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat
@@ -1,3 +1,3 @@
-call "%BUILD_PREFIX%"\Library\bin\pyrcc5.bat chisurf/gui/resources/resource.qrc -o chisurf/gui/resources/resource.py
+call "%BUILD_PREFIX%"\pyrcc5.bat chisurf/gui/resources/resource.qrc -o chisurf/gui/resources/resource.py
 "%PYTHON%" setup.py build_ext --force --inplace
 "%PYTHON%" setup.py install --single-version-externally-managed --record=record.txt