diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-10-26 11:21:27 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-10-26 11:21:27 -0400 |
| commit | ee66a6ed4d89a4bd30d056be6ddd304a026503b7 (patch) | |
| tree | 96bec238c7883384628d00544d84812d7416ad79 | |
| parent | a8b47b0a253f09029747e751c796792d5edb1bbe (diff) | |
debugging strange old version of git-annex in windows installer bundle
| -rw-r--r-- | Jenkinsfile | 2 | ||||
| -rwxr-xr-x | standalone/windows/build.sh | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index c77d5383b..bee9bfc21 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 895b74525..dd2c02ea1 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 \ |