From 82b55015b39dc460e51b79a8427a3991399607bb Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 16 Dec 2022 03:16:03 +0200 Subject: [PATCH 41/41] CI: Buils msys2 ruledit installer with meson See osdn #46283 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 2 +- windows/installer_msys2/Makefile.meson | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b10de1b3fb..8bfd44c1e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: shell: msys2 {0} run: | cd windows/installer_msys2 - make -f Makefile.autotools ci && make -f Makefile.meson ci + make -f Makefile.meson ci os_x: runs-on: macos-12 steps: diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index 48933e391a..ae9935c288 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -64,7 +64,7 @@ snapshot: make -f $(MAKEFILE_NAME) VERSION_REVTYPE="git" EXTRA_CONFIG="-Dgitrev=true $(EXTRA_CONFIG)" all ci: - make -f $(MAKEFILE_NAME) VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="-Dgitrev=true -Dsys-tolua-cmd=true $(EXTRA_CONFIG)" gtk3.22-installer sdl2-installer gtk4-installer qt6-installer + make -f $(MAKEFILE_NAME) VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="-Dgitrev=true -Dsys-tolua-cmd=true $(EXTRA_CONFIG)" gtk3.22-installer sdl2-installer gtk4-installer qt6-installer ruledit-installer-qt6 gtk3.22-installer: make -f $(MAKEFILE_NAME) GUI=gtk3.22 CLIENT=gtk3.22 FCMP=gtk3 installer-common -- 2.35.1