diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-10-26 11:32:04 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-10-26 11:32:04 -0400 |
| commit | 1d519fc105b5ffabe7ae3ebd8b81e0ab604d61f3 (patch) | |
| tree | a027d1662359c16c51e2845fcd65ad7b209f551c | |
| parent | ee66a6ed4d89a4bd30d056be6ddd304a026503b7 (diff) | |
Revert "debugging strange old version of git-annex in windows installer bundle"
This reverts commit ee66a6ed4d89a4bd30d056be6ddd304a026503b7.
| -rw-r--r-- | Jenkinsfile | 2 | ||||
| -rwxr-xr-x | standalone/windows/build.sh | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index bee9bfc21..c77d5383b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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') { diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index dd2c02ea1..895b74525 100755 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -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 \ |