From 1a338ed92015cdded5c6afb5e2838fac4a841c3d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 26 Oct 2017 11:21:27 -0400 Subject: [PATCH] debugging strange old version of git-annex in windows installer bundle --- Jenkinsfile | 2 +- standalone/windows/build.sh | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c77d5383bf..bee9bfc21f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,7 @@ try { } stage('Archive') { - archiveArtifacts 'git-annex-installer.exe,dist/build-version' + archiveArtifacts 'git-annex-installer.exe,git-annex.exe,dist/build-version' } stage('Upload') { diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index 895b745259..dd2c02ea14 100755 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -28,8 +28,9 @@ export UPGRADE_LOCATION #FORCE_GIT_VERSION=1.9.5 #export FORCE_GIT_VERSION -# Don't allow build artifact from a past successful build to be extracted +# Don't allow build artifacts from a past successful build to be extracted # if we fail. +#rm -f git-annex.exe rm -f git-annex-installer.exe # Get extra programs to bundle with git-annex. @@ -57,9 +58,9 @@ getextra () { getextra rsync.exe 85cb7a4d16d274fcf8069b39042965ad26abd6aa # Build git-annex -stack setup --stack-yaml stack-windows.yaml -stack install -j 1 --stack-yaml stack-windows.yaml --no-haddock \ - --local-bin-path . +#stack setup --stack-yaml stack-windows.yaml +#stack install -j 1 --stack-yaml stack-windows.yaml --no-haddock \ +# --local-bin-path . # Build the installer withcygpreferred stack ghc --stack-yaml stack-windows.yaml --no-haddock \