From 1fdfd24b9dc405e719d4d76b9c773d898d909165 Mon Sep 17 00:00:00 2001 From: Dagen Brock Date: Sat, 21 Jan 2017 08:44:43 -0600 Subject: [PATCH 1/2] Update .gitlab-ci.yml with test hotfix for win missing dll. --- .gitlab-ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e89d40a..11b253d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,3 @@ - stages: - build - package @@ -131,7 +130,8 @@ package-win32: - cp /bin/cygstdc++-6.dll . - cp /bin/cygwin1.dll . - cp /bin/cygfreetype-6.dll . - + - cp /bin/cygbz2-1.dll . + artifacts: paths: - gsplus32.exe @@ -143,8 +143,8 @@ package-win32: - cyggcc_s-1.dll - cygstdc++-6.dll - cygwin1.dll - - cygfreetype-6.dll . - + - cygfreetype-6.dll + - cygbz2-1.dll build-win-sdl: tags: @@ -171,6 +171,7 @@ package-win-sdl: - cp /bin/cygstdc++-6.dll . - cp /bin/cygwin1.dll . - cp /bin/cygfreetype-6.dll . + - cp /bin/cygbz2-1.dll . artifacts: paths: @@ -184,3 +185,4 @@ package-win-sdl: - cygstdc++-6.dll - cygwin1.dll - cygfreetype-6.dll + - cygbz2-1.dll From 29ccabdd2ad76ebeeebaf11c164398556b05e44f Mon Sep 17 00:00:00 2001 From: Dagen Brock Date: Sat, 21 Jan 2017 08:50:06 -0600 Subject: [PATCH 2/2] Update .gitlab-ci.yml with second hotfix test for win missing dll --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11b253d..bd81244 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -131,6 +131,7 @@ package-win32: - cp /bin/cygwin1.dll . - cp /bin/cygfreetype-6.dll . - cp /bin/cygbz2-1.dll . + - cp /bin/cygpng16-16.dll . artifacts: paths: @@ -145,6 +146,7 @@ package-win32: - cygwin1.dll - cygfreetype-6.dll - cygbz2-1.dll + - cygpng16-16.dll build-win-sdl: tags: @@ -172,7 +174,8 @@ package-win-sdl: - cp /bin/cygwin1.dll . - cp /bin/cygfreetype-6.dll . - cp /bin/cygbz2-1.dll . - + - cp /bin/cygpng16-16.dll . + artifacts: paths: - gsplus.exe @@ -186,3 +189,4 @@ package-win-sdl: - cygwin1.dll - cygfreetype-6.dll - cygbz2-1.dll + - cygpng16-16.dll