From 52604d3ae065d98ead986d438db65045493835e7 Mon Sep 17 00:00:00 2001 From: Lemures Lemniscati Date: Tue, 16 Feb 2021 23:13:21 +0900 Subject: [PATCH 1/6] Use 'MinGW Makefiles' instead of 'MSYS Makefiles' in msys2.yml --- .github/workflows/msys2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index 9c99d110..1367f724 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -26,7 +26,7 @@ jobs: pwd ls cd build - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/mingw64-x86_64.cmake -G 'MSYS Makefiles' -DWITH_TESTS=yes .. + cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/mingw64-x86_64.cmake -G 'MinGW Makefiles' -DWITH_TESTS=yes .. - name: Build working-directory: ${{runner.workspace}}/build From a8231d6af00dc6bdd1cf421fa8b1eceddf3d7533 Mon Sep 17 00:00:00 2001 From: Lemures Lemniscati Date: Tue, 16 Feb 2021 23:13:22 +0900 Subject: [PATCH 2/6] Omit CMAKE_TOOLCHAIN_FILE in msys2.yml --- .github/workflows/msys2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index 1367f724..d000e9ac 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -26,7 +26,7 @@ jobs: pwd ls cd build - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/mingw64-x86_64.cmake -G 'MinGW Makefiles' -DWITH_TESTS=yes .. + cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G 'MinGW Makefiles' -DWITH_TESTS=yes .. - name: Build working-directory: ${{runner.workspace}}/build From 3c4b8962461db381e3b87c08dcfb69f9e3174313 Mon Sep 17 00:00:00 2001 From: Lemures Lemniscati Date: Tue, 16 Feb 2021 23:13:23 +0900 Subject: [PATCH 3/6] Add mingw-w64-x86_64-libpng in msys2.yml --- .github/workflows/msys2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index d000e9ac..ec3cd739 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -18,7 +18,7 @@ jobs: msystem: MINGW64 update: true path-type: minimal - install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake + install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-libpng - name: Create Build Environment run: | From b397b21597b8ba31986822e8db3015e39d6d87d4 Mon Sep 17 00:00:00 2001 From: Lemures Lemniscati Date: Tue, 16 Feb 2021 23:13:24 +0900 Subject: [PATCH 4/6] Modify Build in msys2.yml --- .github/workflows/msys2.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index ec3cd739..b833359e 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -29,9 +29,11 @@ jobs: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G 'MinGW Makefiles' -DWITH_TESTS=yes .. - name: Build - working-directory: ${{runner.workspace}}/build shell: bash - run: cmake --build . --config $BUILD_TYPE -j 2 + run: | + pwd + cd build + cmake --build . --config $BUILD_TYPE -j 2 - name: Test working-directory: ${{runner.workspace}}/build From cb19e3b13080bbfe7d46b53a0d719fe50d2e5212 Mon Sep 17 00:00:00 2001 From: Lemures Lemniscati Date: Tue, 16 Feb 2021 23:13:25 +0900 Subject: [PATCH 5/6] Modify Test in msys2.yml --- .github/workflows/msys2.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index b833359e..843ded4a 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -36,6 +36,8 @@ jobs: cmake --build . --config $BUILD_TYPE -j 2 - name: Test - working-directory: ${{runner.workspace}}/build shell: bash - run: ctest -C $BUILD_TYPE + run: | + pwd + cd build + ctest -C $BUILD_TYPE From ccc1f30d39a617d48a54a9dd4a473cf72328bbb8 Mon Sep 17 00:00:00 2001 From: Lemures Lemniscati Date: Wed, 17 Feb 2021 21:08:24 +0900 Subject: [PATCH 6/6] Add mingw-w64-x86_64-libiconv in msys2.yml --- .github/workflows/msys2.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index 843ded4a..f7db0eca 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -18,7 +18,12 @@ jobs: msystem: MINGW64 update: true path-type: minimal - install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-libpng + install: + git + mingw-w64-x86_64-toolchain + mingw-w64-x86_64-cmake + mingw-w64-x86_64-libiconv + mingw-w64-x86_64-libpng - name: Create Build Environment run: |