From 2ba9bf7c8a6e2d3a68d1cc5d7db26bed72a43d40 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 13 Jun 2022 08:14:32 +0300 Subject: [PATCH 39/39] CI: Update setup-msys2 to version 2.12.0 -Werror had to be disabled from msys2 CI CXXFLAGS, as the Qt6 -headers in the new baseline have internal trouble causing warnings. See osdn #44776 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 4 ++-- windows/installer_msys2/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2de07a2177..44d80e4b46 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,8 @@ jobs: # A mapping from msys2/setup-msys2 version to msys2 version can be # found at # https://github.com/msys2/setup-msys2/blob/master/CHANGELOG.md - # 2.11.0 provides msys2 snapshot 20220503 - uses: msys2/setup-msys2@v2.11.0 + # 2.12.0 provides msys2 snapshot 20220603 + uses: msys2/setup-msys2@v2.12.0 with: install: > make diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index 07b9b8eebf..febe906c0d 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -94,7 +94,7 @@ snapshot: ci: cd ../.. ; ./autogen.sh --no-configure-run - make VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="--enable-gitrev --with-project-definition=../../../bootstrap/snapshot.project CFLAGS=\\\"-Werror $$CFLAGS\\\" CXXFLAGS=\\\"-Werror $$CXXFLAGS\\\"" gtk3.22-installer sdl2-installer ruledit-installer-qt6 qt6-installer + make VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="--enable-gitrev --with-project-definition=../../../bootstrap/snapshot.project CFLAGS=\\\"-Werror $$CFLAGS\\\" CXXFLAGS=\\\"$$CXXFLAGS\\\"" gtk3.22-installer sdl2-installer ruledit-installer-qt6 qt6-installer # configure Freeciv -- 2.35.1