fix: dev: install extra conda toolchain packages on windows

Signed-off-by: Stephen L Arnold <[email protected]>
berkeley-abc · Mar 7, 2025 · 4b835c3 · 4b835c3
1 parent 26edc35
commit 4b835c3
Showing 1 changed file with 24 additions and 2 deletions.
diff --git a/.github/workflows/conda-dev.yml b/.github/workflows/conda-dev.yml
@@ -32,7 +32,7 @@ jobs:
             build_type: 'Debug'
             extra_args: '-DBUILD_SHARED_LIBS=ON -DABC_USE_SONAME=ON'
           - os: 'windows-2019'
-            generator: 'Ninja'
+            generator: 'MinGW Makefiles'
             build_type: 'Debug'
             extra_args: '-DBUILD_SHARED_LIBS=OFF -DABC_USE_NO_READLINE=ON -DVENDOR_GTEST=ON'
     env:
@@ -42,6 +42,21 @@ jobs:
       CMAKE_ARGS: ${{ matrix.use_namespace && '-DABC_USE_NAMESPACE=xxx' || '' }}
 
     steps:
+    #- if: matrix.os == 'windows-2019'
+      #name: Install newer windows compiler
+      #id: install_cc
+      #uses: rlalik/setup-cpp-compiler@master
+      #with:
+        #compiler: g++-11.2.0
+
+    #- if: matrix.os == 'windows-2019'
+      #name: Use compiler
+      #shell: bash -l {0}
+      #env:
+          #CC: ${{ steps.install_cc.outputs.cc }}
+          #CXX: ${{ steps.install_cc.outputs.cxx }}
+      #run: |
+
     - uses: actions/checkout@v4
 
     - name: Setup base python
@@ -54,7 +69,7 @@ jobs:
       uses: actions/cache@v4
       env:
         # Increase this value to reset cache if environment.devenv.yml has not changed
-        CACHE_NUMBER: 1
+        CACHE_NUMBER: 2
       with:
         path: ~/conda_pkgs_dir
         key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('environment.devenv.yml') }}
@@ -68,6 +83,13 @@ jobs:
         channel-priority: flexible
         conda-remove-defaults: true
 
+    - name: Add toolchain windows specific
+      if: contains( matrix.os, 'windows')
+      shell: bash -l {0}
+      run: |
+        conda install -y gcc m2-pkg-config
+        g++ --version
+
     - name: Configure condadev environment
       shell: bash -l {0}
       env: