From 840aafed86982b4267a4077c72bc2e2077f69826 Mon Sep 17 00:00:00 2001 From: rdinnager Date: Fri, 11 Feb 2022 10:49:43 -0500 Subject: [PATCH 1/4] preliminary testing to fix windows test issues --- .github/workflows/tests.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 51aaed7f6..8ef4b84b5 100644 --- 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 @@ -325,8 +323,6 @@ jobs: mingw-w64-${{matrix.env}}-toolchain mingw-w64-${{matrix.env}}-cmake mingw-w64-${{matrix.env}}-qt5-base - automake1.16 - autoconf - name: Build (cmake) run: | From 75e4fbbcc5a134f80715c6a4b00524a20dff187d Mon Sep 17 00:00:00 2001 From: rdinnager Date: Fri, 11 Feb 2022 11:10:14 -0500 Subject: [PATCH 2/4] attempting to solve aclocal error by updating timestamps of automake files --- .github/workflows/tests.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8ef4b84b5..566db4c3e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -265,6 +265,9 @@ jobs: - name: Debug run: | + cd windows_compat/gnulib + touch aclocal.m4 Makefile.am configure Makefile.in + cd ../.. mkdir Debug cd Debug cmake -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug .. @@ -272,6 +275,9 @@ jobs: - name: Build (Release) run: | + cd windows_compat/gnulib + touch aclocal.m4 Makefile.am configure Makefile.in + cd ../.. mkdir Release cd Release cmake -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release .. @@ -326,6 +332,9 @@ jobs: - name: Build (cmake) run: | + cd windows_compat/gnulib + touch aclocal.m4 Makefile.am configure Makefile.in + cd ../.. # Just do a release build. mkdir Release cd Release From 46ca1182559c8e99cf86475b175731e5010a35ba Mon Sep 17 00:00:00 2001 From: rdinnager Date: Fri, 11 Feb 2022 11:23:20 -0500 Subject: [PATCH 3/4] Update timestamps on more files --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 566db4c3e..ba6f5a519 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -266,7 +266,7 @@ jobs: - name: Debug run: | cd windows_compat/gnulib - touch aclocal.m4 Makefile.am configure Makefile.in + touch aclocal.m4 Makefile.am configure configure.ac config.h.in Makefile.in cd ../.. mkdir Debug cd Debug @@ -276,7 +276,7 @@ jobs: - name: Build (Release) run: | cd windows_compat/gnulib - touch aclocal.m4 Makefile.am configure Makefile.in + touch aclocal.m4 Makefile.am configure configure.ac config.h.in Makefile.in cd ../.. mkdir Release cd Release @@ -333,7 +333,7 @@ jobs: - name: Build (cmake) run: | cd windows_compat/gnulib - touch aclocal.m4 Makefile.am configure Makefile.in + touch aclocal.m4 Makefile.am configure configure.ac config.h.in Makefile.in cd ../.. # Just do a release build. mkdir Release From d38d8435facedcc57ad5b61b994e3ef6ac005582 Mon Sep 17 00:00:00 2001 From: rdinnager Date: Fri, 11 Feb 2022 11:43:19 -0500 Subject: [PATCH 4/4] slight variation --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ba6f5a519..62e7bc10f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -266,7 +266,7 @@ jobs: - name: Debug run: | cd windows_compat/gnulib - touch aclocal.m4 Makefile.am configure configure.ac config.h.in Makefile.in + touch --date="`date`" aclocal.m4 Makefile.am configure configure.ac config.h.in Makefile.in cd ../.. mkdir Debug cd Debug @@ -276,7 +276,7 @@ jobs: - name: Build (Release) run: | cd windows_compat/gnulib - touch aclocal.m4 Makefile.am configure configure.ac config.h.in Makefile.in + touch --date="`date`" aclocal.m4 Makefile.am configure configure.ac config.h.in Makefile.in cd ../.. mkdir Release cd Release @@ -333,7 +333,7 @@ jobs: - name: Build (cmake) run: | cd windows_compat/gnulib - touch aclocal.m4 Makefile.am configure configure.ac config.h.in Makefile.in + touch --date="`date`" aclocal.m4 Makefile.am configure configure.ac config.h.in Makefile.in cd ../.. # Just do a release build. mkdir Release