diff --git a/Jenkinsfile b/Jenkinsfile index 45c25def..57a9d328 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,8 @@ def packageBuildSteps = [ stage("windows") { try { checkout scm - sh("make -f Makefile.win archive") + sh("make -f Makefile.win REF=v1.2.13 archive") + archiveArtifacts(artifacts: 'build/windows/containerd.zip', onlyIfSuccessful: true) } finally { deleteDir() } diff --git a/Makefile.win b/Makefile.win index 38484990..862c75fe 100644 --- a/Makefile.win +++ b/Makefile.win @@ -40,7 +40,7 @@ windows-image: . echo 1 > $@ -build/windows/%.exe: windows-image checkout +build/windows/%: windows-image checkout Powershell.exe New-Item -ItemType Directory -Force -Path build/windows/ docker run \ --rm \ @@ -48,7 +48,7 @@ build/windows/%.exe: windows-image checkout -v "$(CURDIR)/build/windows:C:/gopath/src/github.com/containerd/containerd/bin" \ -w "C:/gopath/src/github.com/containerd/containerd" \ dockereng/containerd-windows-builder \ - make bin/$* + make BINARY_SUFFIX=".exe" bin/$* build/windows/containerd.zip: build/windows/containerd.exe build/windows/ctr.exe Powershell.exe Compress-Archive -Force -Path 'build/windows/*.exe' -DestinationPath '$@'