Browse Source

Use shared setup file for 32 and 64 bit bingw

Ivan Savenko 1 năm trước cách đây
mục cha
commit
6b1fd428bd

+ 2 - 2
.github/workflows/github.yml

@@ -85,7 +85,7 @@ jobs:
             pack_type: Release
             extension: exe
             cmake_args: -G Ninja
-            before_install: mingw_x86_64.sh
+            before_install: mingw.sh
             preset: windows-mingw-conan-linux
             conan_profile: mingw64-linux.jinja
             conan_prebuilts: dependencies-mingw-x86-64
@@ -96,7 +96,7 @@ jobs:
             pack_type: Release
             extension: exe
             cmake_args: -G Ninja
-            before_install: mingw_x86.sh
+            before_install: mingw.sh
             preset: windows-mingw-conan-linux
             conan_profile: mingw32-linux.jinja
             conan_prebuilts: dependencies-mingw-x86

+ 2 - 0
CI/before_install/mingw_x86.sh → CI/before_install/mingw.sh

@@ -2,4 +2,6 @@
 
 sudo apt-get update
 sudo apt-get install ninja-build mingw-w64 nsis
+
 sudo update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix
+sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix

+ 0 - 5
CI/before_install/mingw_x86_64.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-sudo apt-get update
-sudo apt-get install ninja-build mingw-w64 nsis
-sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix