Merge branch 'master' of https://github.com/MesserLab/SLiM

MesserLab · Feb 12, 2022 · e78cb02 · e78cb02
2 parents 42b9aad + 5512d19
commit e78cb02
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -220,8 +220,6 @@ jobs:
           msys2-devel
           mingw-w64-${{matrix.env}}-toolchain
           mingw-w64-${{matrix.env}}-cmake
-          automake1.16
-          autoconf
 
     - name: Cache conda and dependancies
       id: cache
@@ -232,7 +230,7 @@ jobs:
           /usr/share/miniconda/envs/anaconda-client-env
           ~/osx-conda
           ~/.profile
-        key: ${{ runner.os }}-${{ matrix.python}}-conda-v14-${{ hashFiles('treerec/tests/conda-requirements.txt') }}-${{ hashFiles('treerec/tests/pip-requirements.txt') }}
+        key: ${{ runner.os }}-${{ matrix.python}}-conda-v15-${{ hashFiles('treerec/tests/conda-requirements.txt') }}-${{ hashFiles('treerec/tests/pip-requirements.txt') }}
 
     - name: Install Conda
       uses: conda-incubator/setup-miniconda@v2
@@ -250,13 +248,13 @@ jobs:
       shell: pwsh
       run: |
         C:\Miniconda\condabin\conda.bat install --yes --file=treerec/tests/conda-requirements.txt
-        C:\Miniconda\condabin\conda.bat install --yes --file=treerec/tests/pip-requirements.txt
         C:\Miniconda\condabin\conda.bat init powershell
 
     - name: Install pip deps
       if: steps.cache.outputs.cache-hit != 'true'
       shell: pwsh
       run: |
+        C:\Miniconda\condabin\conda.bat activate anaconda-client-env
         pip install -r treerec/tests/pip-requirements.txt
 
     - name: Install pyslim
@@ -267,13 +265,19 @@ jobs:
 
     - name: Debug
       run: |
+        cd windows_compat/gnulib
+        touch --date="`date`" aclocal.m4 Makefile.am configure configure.ac config.h.in Makefile.in
+        cd ../..
         mkdir Debug
         cd Debug
         cmake -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug ..
         make -j 2
 
     - name: Build (Release)
       run: |
+        cd windows_compat/gnulib
+        touch --date="`date`" aclocal.m4 Makefile.am configure configure.ac config.h.in Makefile.in
+        cd ../..
         mkdir Release
         cd Release
         cmake -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release ..
@@ -325,11 +329,12 @@ jobs:
           mingw-w64-${{matrix.env}}-toolchain
           mingw-w64-${{matrix.env}}-cmake
           mingw-w64-${{matrix.env}}-qt5-base
-          automake1.16
-          autoconf
 
     - name: Build (cmake)
       run: |
+        cd windows_compat/gnulib
+        touch --date="`date`" aclocal.m4 Makefile.am configure configure.ac config.h.in Makefile.in
+        cd ../..
         # Just do a release build.
         mkdir Release
         cd Release