diff --git a/Jenkinsfile b/Jenkinsfile index a2e3aa4..cff6e61 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,8 @@ pipeline { sh 'apt-get update && apt-get install -y libsecret-1-dev pass' sh 'make deps fmt lint test' sh 'make pass secretservice' - archiveArtifacts 'bin/docker-credential-*' + sh 'make linuxrelease' + archiveArtifacts 'release/docker-credential-*' } } } @@ -45,7 +46,8 @@ pipeline { dir('src/github.com/docker/docker-credential-helpers') { sh 'make deps fmt lint test' sh 'make osxcodesign' - archiveArtifacts 'bin/docker-credential-*' + sh 'make osxrelease' + archiveArtifacts 'release/docker-credential-*' } } } diff --git a/Makefile b/Makefile index db58f8a..1eb9f08 100644 --- a/Makefile +++ b/Makefile @@ -21,11 +21,6 @@ osxcodesign: osxkeychain xcrun -log codesign -s $(SIGNINGHASH) --force --verbose bin/docker-credential-osxkeychain xcrun codesign --verify --deep --strict --verbose=2 --display bin/docker-credential-osxkeychain -osxrelease: clean vet_osx lint fmt test osxcodesign - mkdir -p release - @echo "\nPackaging version ${VERSION}\n" - cd bin && tar cvfz ../release/docker-credential-osxkeychain-v$(VERSION)-amd64.tar.gz docker-credential-osxkeychain - secretservice: mkdir -p bin go build -o bin/docker-credential-secretservice secretservice/cmd/main_linux.go @@ -38,9 +33,17 @@ wincred: mkdir -p bin go build -o bin/docker-credential-wincred.exe wincred/cmd/main_windows.go -winrelease: clean vet_win lint fmt test wincred +linuxrelease: + mkdir -p release + cd bin && tar cvfz ../release/docker-credential-pass-v$(VERSION)-amd64.tar.gz docker-credential-pass + cd bin && tar cvfz ../release/docker-credential-secretservice-v$(VERSION)-amd64.tar.gz docker-credential-secretservice + +osxrelease: + mkdir -p release + cd bin && tar cvfz ../release/docker-credential-osxkeychain-v$(VERSION)-amd64.tar.gz docker-credential-osxkeychain + +winrelease: mkdir -p release - @echo "\nPackaging version ${VERSION}\n" cd bin && zip ../release/docker-credential-wincred-v$(VERSION)-amd64.zip docker-credential-wincred.exe test: