From 88f932172b92e656f7ed9c09ea066eb6874b48f2 Mon Sep 17 00:00:00 2001 From: Guillaume Rose Date: Wed, 17 Jul 2019 10:12:27 +0200 Subject: [PATCH 1/3] Remove old appveyor configuration Signed-off-by: Guillaume Rose --- appveyor.yml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 04eadb0..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,24 +0,0 @@ -image: Visual Studio 2015 -environment: - GOPATH: c:\gopath - -stack: go 1.8.7 - -clone_folder: c:\gopath\src\github.com\docker\docker-credential-helpers -clone_depth: 10 - -before_build: - - set PATH=%PATH%;C:\MinGW\bin; - -build_script: - - mingw32-make vet_win wincred - -test_script: - - mingw32-make test - -deploy: off - -artifacts: - - path: bin/docker-credential-wincred.exe - -configuration: Release From 86b653a9f1d68695f66a007bb162ced78100b476 Mon Sep 17 00:00:00 2001 From: Guillaume Rose Date: Wed, 17 Jul 2019 10:26:03 +0200 Subject: [PATCH 2/3] Create tarballs in Jenkins. Signed-off-by: Guillaume Rose --- Jenkinsfile | 6 ++++-- Makefile | 17 ++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) 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: From 69fb197018974c1b3843afd61d3d0807e90146ae Mon Sep 17 00:00:00 2001 From: Guillaume Rose Date: Wed, 17 Jul 2019 10:21:49 +0200 Subject: [PATCH 3/3] =?UTF-8?q?Don=E2=80=99t=20use=20binaries=20built=20by?= =?UTF-8?q?=20Travis.=20Use=20Jenkins=20binaries.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guillaume Rose --- .travis.yml | 26 -------------------------- ci/before_deploy.sh | 15 --------------- 2 files changed, 41 deletions(-) delete mode 100644 ci/before_deploy.sh diff --git a/.travis.yml b/.travis.yml index 108c479..65398a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,29 +22,3 @@ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh ci/before_script_linux.sh; fi - make validate script: make test - - before_deploy: - - sh ci/before_deploy.sh - - deploy: - provider: releases - api_key: - secure: "$GITHUB_TOKEN" - # upload file artifacts using a glob expression. - # It requires both options `file_glob` and `file`: - # https://github.com/travis-ci/dpl/blob/master/lib/dpl/provider/releases.rb#L47-L53 - file_glob: true - file: docker-credential-*-${TRAVIS_TAG}-amd64.tar.gz - # don't delete the artifacts from previous phases - skip_cleanup: true - # deploy when a new tag is pushed - on: - tags: true - - branches: - only: - # Pushes and PR to the master branch - - master - # IMPORTANT Ruby regex to match tags. Required, or travis won't trigger deploys when a new tag - # is pushed. This regex matches semantic versions like v1.2.3-rc4+2016.02.22 - - /^v\d+\.\d+\.\d+.*$/ diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh deleted file mode 100644 index 2b27bfe..0000000 --- a/ci/before_deploy.sh +++ /dev/null @@ -1,15 +0,0 @@ -set -ex - -mkdir bin -case "$TRAVIS_OS_NAME" in - "osx") - go build -o bin/docker-credential-osxkeychain osxkeychain/cmd/main_darwin.go - cd bin - tar czf ../docker-credential-osxkeychain-${TRAVIS_TAG}-amd64.tar.gz docker-credential-osxkeychain - ;; - "linux") - go build -o bin/docker-credential-secretservice secretservice/cmd/main_linux.go - cd bin - tar czf ../docker-credential-secretservice-${TRAVIS_TAG}-amd64.tar.gz docker-credential-secretservice - ;; -esac