Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove vendorized deps #93

Merged
merged 2 commits into from
Apr 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
language: go
sudo: false

go:
- 1.13.x

deploy:
provider: releases
api_key:
Expand All @@ -15,7 +16,6 @@ deploy:
repo: square/certstrap
tags: true
go: "1.13.x" # ensure that this matches one of the go versions specified at the top
before_script:
- "./build"

script:
- "./test"
- "./integration_test"
12 changes: 3 additions & 9 deletions build
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,8 @@ if [[ $BUILD_TAG == v* ]]; then
BUILD_TAG=$(echo $BUILD_TAG | cut -c 2-)
fi

export GOPATH=${PWD}/gopath

rm -f $GOPATH/src/${REPO_PATH}
mkdir -p $GOPATH/src/${ORG_PATH}
ln -s ${PWD} $GOPATH/src/${REPO_PATH}

eval $(go env)

GOARCH=amd64 GOOS=linux go build -ldflags "-X main.release=$BUILD_TAG" -o bin/certstrap-${BUILD_TAG}-linux-amd64 ${REPO_PATH}
GOARCH=amd64 GOOS=darwin go build -ldflags "-X main.release=$BUILD_TAG" -o bin/certstrap-${BUILD_TAG}-darwin-amd64 ${REPO_PATH}
GOARCH=amd64 GOOS=windows go build -ldflags "-X main.release=$BUILD_TAG" -o bin/certstrap-${BUILD_TAG}-windows-amd64 ${REPO_PATH}
GOARCH=amd64 GOOS=linux go build -ldflags "-X main.release=$BUILD_TAG" -o bin/certstrap-${BUILD_TAG}-linux-amd64 .
GOARCH=amd64 GOOS=darwin go build -ldflags "-X main.release=$BUILD_TAG" -o bin/certstrap-${BUILD_TAG}-darwin-amd64 .
GOARCH=amd64 GOOS=windows go build -ldflags "-X main.release=$BUILD_TAG" -o bin/certstrap-${BUILD_TAG}-windows-amd64 .
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ require (
golang.org/x/crypto v0.0.0-20181127143415-eb0de9b17e85 // indirect
golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35 // indirect
)

go 1.13
5 changes: 1 addition & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSY
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c h1:kQWxfPIHVLbgLzphqk3QUflDy9QdksZR4ygR807bpy0=
github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/urfave/cli v1.21.0 h1:wYSSj06510qPIzGSua9ZqsncMmWE3Zr55KBERygyrxE=
github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ=
github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY=
github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/urfave/cli v1.22.2 h1:gsqYFH8bb9ekPA12kRo0hfjngWQjkJPlN9R0N78BoUo=
github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/urfave/cli v1.22.3 h1:FpNT6zq26xNpHZy08emi755QwzLPs6Pukqjlc7RfOMU=
Expand Down
11 changes: 1 addition & 10 deletions test → integration_test
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,8 @@

source ./build

if [ -z "$PKG" ]; then
PKG="cmd depot pkix tests"
fi

# tests package relies on BUILD_TAG to be exported
# BUILD_TAG is set by build script
export BUILD_TAG

# Unit tests
echo
for mod in $PKG; do
mod_path=$REPO_PATH/$mod
go test -v $mod_path
done
go test -v -tags=integration ./...
14 changes: 8 additions & 6 deletions tests/basic_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// +build integration

/*-
* Copyright 2015 Square Inc.
* Copyright 2014 CoreOS
Expand All @@ -19,19 +21,19 @@ package tests

import (
"bytes"
"fmt"
"io"
"os"
"os/exec"
"runtime"
"strings"
"testing"
"runtime"
"fmt"
"os"
)

const (
depotDir = ".certstrap-test"
hostname = "host1"
passphrase = "123456"
depotDir = ".certstrap-test"
hostname = "host1"
passphrase = "123456"
)

var binPath = fmt.Sprintf("../bin/certstrap-%s-%s-amd64", os.Getenv("BUILD_TAG"), runtime.GOOS)
Expand Down
2 changes: 2 additions & 0 deletions tests/ip_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// +build integration

/*-
* Copyright 2015 Square Inc.
* Copyright 2014 CoreOS
Expand Down
2 changes: 2 additions & 0 deletions tests/not_ca_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// +build integration

/*-
* Copyright 2015 Square Inc.
* Copyright 2014 CoreOS
Expand Down
2 changes: 2 additions & 0 deletions tests/uri_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// +build integration

/*-
* Copyright 2015 Square Inc.
* Copyright 2014 CoreOS
Expand Down
2 changes: 2 additions & 0 deletions tests/workflow_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// +build integration

/*-
* Copyright 2015 Square Inc.
* Copyright 2014 CoreOS
Expand Down
11 changes: 0 additions & 11 deletions vendor/github.com/howeyc/gopass/.travis.yml

This file was deleted.

15 changes: 0 additions & 15 deletions vendor/github.com/howeyc/gopass/LICENSE.txt

This file was deleted.

Loading