Revert "debugging strange old version of git-annex in windows installer bundle"

This reverts commit 1a338ed920.
This commit is contained in:
Joey Hess 2017-10-26 11:32:04 -04:00
parent 1a338ed920
commit 6e202b8dc9
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 5 additions and 6 deletions

2
Jenkinsfile vendored
View file

@ -23,7 +23,7 @@ try {
}
stage('Archive') {
archiveArtifacts 'git-annex-installer.exe,git-annex.exe,dist/build-version'
archiveArtifacts 'git-annex-installer.exe,dist/build-version'
}
stage('Upload') {

View file

@ -28,9 +28,8 @@ export UPGRADE_LOCATION
#FORCE_GIT_VERSION=1.9.5
#export FORCE_GIT_VERSION
# Don't allow build artifacts from a past successful build to be extracted
# Don't allow build artifact 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.
@ -58,9 +57,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 \