From 49674cfd9512a07f4c6144c2fe87e812aba00406 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 23 Apr 2020 19:35:51 +0200 Subject: [PATCH 1/3] Makefile.win: set BINARY_SUFFIX Signed-off-by: Sebastiaan van Stijn --- Makefile.win | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 '$@' From 058d54c18de91fa6cbf1a5b45bc858bd23149295 Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Wed, 4 Mar 2020 15:39:27 +0100 Subject: [PATCH 2/3] Archive windows artifacts Signed-off-by: Stefan Scherer --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 45c25def..454b24e6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,6 +59,7 @@ def packageBuildSteps = [ try { checkout scm sh("make -f Makefile.win archive") + archiveArtifacts(artifacts: 'build/windows/containerd.zip', onlyIfSuccessful: true) } finally { deleteDir() } From e79c19c184689923ea7021968ad068c593572970 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 23 Apr 2020 19:55:27 +0200 Subject: [PATCH 3/3] WIP try building v1.2.13 Signed-off-by: Sebastiaan van Stijn --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 454b24e6..57a9d328 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,7 @@ 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()