From a9669578fc31beabc8885b436643b4182247fd6d Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Tue, 31 Jan 2023 18:13:51 +0200 Subject: [PATCH] Remove MXE action from CI --- .github/workflows/github.yml | 8 ------ CI/mxe/before_install.sh | 53 ------------------------------------ 2 files changed, 61 deletions(-) delete mode 100644 CI/mxe/before_install.sh diff --git a/.github/workflows/github.yml b/.github/workflows/github.yml index e2b285e6f..b2b967f09 100644 --- a/.github/workflows/github.yml +++ b/.github/workflows/github.yml @@ -99,14 +99,6 @@ jobs: extension: ipa preset: ios-release-conan conan_profile: ios-arm64 - - platform: mxe - os: ubuntu-20.04 - mxe: i686-w64-mingw32.shared - test: 0 - pack: 1 - cpack_args: -D CPACK_NSIS_EXECUTABLE=`which makensis` - extension: exe - cmake_args: -G Ninja - platform: msvc os: windows-latest test: 0 diff --git a/CI/mxe/before_install.sh b/CI/mxe/before_install.sh deleted file mode 100644 index 0a4855f2d..000000000 --- a/CI/mxe/before_install.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -# steps to upgrade MXE dependencies: -# 1) Use Debian/Ubuntu system or install one (virtual machines will work too) -# 2) update following script to include any new dependencies -# You can also run it to upgrade existing ones, but don't expect much -# MXE repository only provides ancient versions for the sake of "stability" -# https://github.com/vcmi/vcmi-deps-mxe/blob/master/mirror-mxe.sh -# 3) make release in vcmi-deps-mxe repository using resulting tar archive -# 4) update paths to tar archive in this script - -# Install nsis for installer creation -sudo add-apt-repository 'deb http://security.ubuntu.com/ubuntu bionic-security main' -sudo apt-get install -qq nsis ninja-build libssl1.0.0 - -# MXE repository was too slow for Travis far too often -wget -nv https://github.com/vcmi/vcmi-deps-mxe/releases/download/2021-02-20/mxe-i686-w64-mingw32.shared-2021-01-22.tar -tar -xvf mxe-i686-w64-mingw32.shared-2021-01-22.tar -sudo dpkg -i mxe-*.deb -sudo apt-get install -f --yes - -if false; then - # Add MXE repository and key - echo "deb http://pkg.mxe.cc/repos/apt/debian wheezy main" \ - | sudo tee /etc/apt/sources.list.d/mxeapt.list - - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB - - # Install needed packages - sudo apt-get update -qq - - sudo apt-get install -q --yes \ - mxe-$MXE_TARGET-gcc \ - mxe-$MXE_TARGET-boost \ - mxe-$MXE_TARGET-zlib \ - mxe-$MXE_TARGET-sdl2 \ - mxe-$MXE_TARGET-sdl2-gfx \ - mxe-$MXE_TARGET-sdl2-image \ - mxe-$MXE_TARGET-sdl2-mixer \ - mxe-$MXE_TARGET-sdl2-ttf \ - mxe-$MXE_TARGET-ffmpeg \ - mxe-$MXE_TARGET-qt \ - mxe-$MXE_TARGET-qtbase \ - mxe-$MXE_TARGET-intel-tbb \ - mxe-i686-w64-mingw32.static-luajit - -fi # Disable - -# alias for CMake - -CMAKE_LOCATION=$(which cmake) -sudo mv $CMAKE_LOCATION $CMAKE_LOCATION.orig -sudo ln -s /usr/lib/mxe/usr/bin/$MXE_TARGET-cmake $CMAKE_LOCATION