From 06b5eaceebccbffc29528f48257a8d1888c6e479 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sun, 15 Sep 2019 16:39:54 +1000 Subject: [PATCH] fixed appveyor yml issues --- appveyor-build.sh | 7 ++++++- appveyor.yml | 6 ------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/appveyor-build.sh b/appveyor-build.sh index d263b71a6..30aa6b52f 100644 --- a/appveyor-build.sh +++ b/appveyor-build.sh @@ -1,3 +1,8 @@ +# Set architecture +ARCH=x86_64 +MINGW_PATH=mingw64 +NSISDEF=-DX64 + # Update packages pacman -Syu --noconfirm @@ -31,7 +36,7 @@ do dep_path=${dep_output[2]} # If this is a mingw dependency, copy it into the deploy folder - if [[ $dep_path == /mingw64* ]] + if [[ $dep_path == /$MINGW_PATH* ]] then cp $dep_path . fi diff --git a/appveyor.yml b/appveyor.yml index 58d6e150d..aafe2b5b3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,12 +5,6 @@ branches: image: Visual Studio 2015 environment: TRAVIS_REPO_SLUG: olive-editor/olive -matrix: -- MSYSTEM: MINGW64 - ARCH: x86_64 - NSISDEF: -DX64 -- MSYSTEM: MINGW32 - ARCH: i686 build_script: - cmd: appveyor-build.bat artifacts: