From 4c3e68998c35d94bd8be9b72843bd1244d91d716 Mon Sep 17 00:00:00 2001 From: Stephen Date: Thu, 9 Feb 2017 15:15:14 -0800 Subject: [PATCH 1/5] Create .appveyor.yml --- .appveyor.yml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 000000000..9d7e16be8 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,42 @@ +environment: + CYG_MIRROR: http://cygwin.mirror.constant.com + CYG_PACKAGES: make,gcc-core,clang + matrix: + - MSYSTEM: MINGW64 + BASH: C:\msys64\usr\bin\bash + MSYS_CACHE: C:\msys64\var\cache\pacman\pkg + CC: gcc + - MSYSTEM: MINGW32 + BASH: C:\msys64\usr\bin\bash + MSYS_CACHE: C:\msys64\var\cache\pacman\pkg + CC: gcc + - CYG_ROOT: C:\cygwin64 + CYG_CACHE: C:\cygwin64\var\cache\setup + CYG_SETUP: setup-x86_64.exe + BASH: C:\cygwin64\bin\bash + CC: gcc + - CYG_ROOT: C:\cygwin + CYG_CACHE: C:\cygwin\var\cache\setup + CYG_SETUP: setup-x86.exe + BASH: C:\cygwin\bin\bash + CC: gcc + +clone_depth: 1 + +# Attempt to ensure we don't try to convert line endings to Win32 CRLF as this will cause build to fail +init: + - git config --global core.autocrlf input +# Allows RDP +# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + +# Install needed build dependencies +install: + - ps: if (Test-Path Env:\CYG_ROOT) { Start-FileDownload "http://cygwin.com/$env:CYG_SETUP" -FileName "$env:CYG_SETUP" } + - if defined CYG_ROOT (%CYG_SETUP% --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages "%CYG_PACKAGES%" --upgrade-also) + - if defined MSYSTEM (%BASH% -lc "pacman -Suuy --noconfirm") + - if defined MSYSTEM (%BASH% -lc "pacman -Suuy --noconfirm") +build_script: + - if defined BASH (%BASH% -lc "cd $(cygpath ${APPVEYOR_BUILD_FOLDER}) && git submodule update --init && make") +# Allows RDP +#on_finish: +# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) From eb681652d34e52c08fd7a493f9fc816bc9955f18 Mon Sep 17 00:00:00 2001 From: Stephen Date: Thu, 9 Feb 2017 15:16:23 -0800 Subject: [PATCH 2/5] remove unnecessary git submodule clone --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 022a5d429..30b8ab16c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,8 @@ os: - linux - osx language: c -install: - - git submodule init - - git submodule update compiler: - clang - gcc script: - make - From fd0febeabd3af9ae4b7fddda137efdbac30a5175 Mon Sep 17 00:00:00 2001 From: Stephen Date: Thu, 9 Feb 2017 15:17:09 -0800 Subject: [PATCH 3/5] cleanup git submodule command --- BUILD.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/BUILD.md b/BUILD.md index 85e33d259..fecf7179e 100644 --- a/BUILD.md +++ b/BUILD.md @@ -16,8 +16,7 @@ $ git clone https://github.com/hashcat/hashcat.git Get a copy of the **OpenCL Headers** repository ```sh -$ git submodule init -$ git submodule update +$ git submodule update --init ``` Run "make" From acc16faaa875ab5eb5506b76be5441076afef70a Mon Sep 17 00:00:00 2001 From: Stephen Date: Thu, 9 Feb 2017 20:09:11 -0800 Subject: [PATCH 4/5] reorder for cygwin first and enable rdp --- .appveyor.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 9d7e16be8..06f558a25 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,14 +2,6 @@ environment: CYG_MIRROR: http://cygwin.mirror.constant.com CYG_PACKAGES: make,gcc-core,clang matrix: - - MSYSTEM: MINGW64 - BASH: C:\msys64\usr\bin\bash - MSYS_CACHE: C:\msys64\var\cache\pacman\pkg - CC: gcc - - MSYSTEM: MINGW32 - BASH: C:\msys64\usr\bin\bash - MSYS_CACHE: C:\msys64\var\cache\pacman\pkg - CC: gcc - CYG_ROOT: C:\cygwin64 CYG_CACHE: C:\cygwin64\var\cache\setup CYG_SETUP: setup-x86_64.exe @@ -20,6 +12,14 @@ environment: CYG_SETUP: setup-x86.exe BASH: C:\cygwin\bin\bash CC: gcc + - MSYSTEM: MINGW64 + BASH: C:\msys64\usr\bin\bash + MSYS_CACHE: C:\msys64\var\cache\pacman\pkg + CC: gcc + - MSYSTEM: MINGW32 + BASH: C:\msys64\usr\bin\bash + MSYS_CACHE: C:\msys64\var\cache\pacman\pkg + CC: gcc clone_depth: 1 @@ -27,7 +27,7 @@ clone_depth: 1 init: - git config --global core.autocrlf input # Allows RDP -# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) # Install needed build dependencies install: @@ -39,4 +39,4 @@ build_script: - if defined BASH (%BASH% -lc "cd $(cygpath ${APPVEYOR_BUILD_FOLDER}) && git submodule update --init && make") # Allows RDP #on_finish: -# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) From 9c43109ee7ef1c97a640c807e45f98cb2f5fed80 Mon Sep 17 00:00:00 2001 From: Stephen Date: Thu, 9 Feb 2017 20:18:14 -0800 Subject: [PATCH 5/5] remove rdp blocks --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 06f558a25..7f22d551e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -27,7 +27,7 @@ clone_depth: 1 init: - git config --global core.autocrlf input # Allows RDP - - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) +# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) # Install needed build dependencies install: @@ -39,4 +39,4 @@ build_script: - if defined BASH (%BASH% -lc "cd $(cygpath ${APPVEYOR_BUILD_FOLDER}) && git submodule update --init && make") # Allows RDP #on_finish: - - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) +# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))