Skip to content

Commit ab23b33

Browse files
duanhongyiduanhongyi
committed
chore(workflow-cli): use go mode replace dep
1 parent dae06b3 commit ab23b33

6 files changed

Lines changed: 77 additions & 253 deletions

File tree

‎Gopkg.lock‎

Lines changed: 0 additions & 184 deletions
This file was deleted.

‎Gopkg.toml‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎Makefile‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
# the filepath to this repository, relative to $GOPATH/src
22
REPO_PATH := github.com/drycc/workflow-cli
3-
DEV_ENV_IMAGE := quay.io/drycc/go-dev:v0.22.0
3+
DEV_ENV_IMAGE := golang:1.14
44
DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
55

6-
HOST_OS := $(shell uname)
7-
ifeq ($(HOST_OS),Darwin)
8-
GOOS=darwin
9-
else
10-
GOOS=linux
11-
endif
12-
136
# The latest git tag on branch
147
GIT_TAG ?= $(shell git describe --abbrev=0 --tags)
158
REVISION ?= $(shell git rev-parse --short HEAD)
@@ -18,9 +11,6 @@ REGISTRY ?= quay.io/
1811
IMAGE_PREFIX ?= drycc
1912
IMAGE := ${REGISTRY}${IMAGE_PREFIX}/workflow-cli-dev:${REVISION}
2013

21-
BUILD_OS ?=linux darwin windows
22-
BUILD_ARCH ?=amd64 386
23-
2414
DIST_DIR ?= _dist
2515

2616
DEV_ENV_CMD := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}
@@ -30,14 +20,15 @@ define build-install-script
3020
endef
3121

3222
bootstrap:
33-
${DEV_ENV_CMD} dep ensure
23+
${DEV_ENV_CMD} go mod vendor
3424

3525
# This is supposed to be run within a docker container
3626
build-revision:
37-
${DEV_ENV_CMD} gox -verbose ${GO_LDFLAGS} -os="${BUILD_OS}" -arch="${BUILD_ARCH}" -output="${DIST_DIR}/${REVISION}/drycc-${REVISION}-{{.OS}}-{{.Arch}}" .
27+
${DEV_ENV_CMD} bash build.sh build-revision ${REVISION}
28+
3829
# This is supposed to be run within a docker container
3930
build-tag:
40-
${DEV_ENV_CMD} gox -verbose ${GO_LDFLAGS} -os="${BUILD_OS}" -arch="${BUILD_ARCH}" -output="${DIST_DIR}/${GIT_TAG}/drycc-${GIT_TAG}-{{.OS}}-{{.Arch}}" .
31+
${DEV_ENV_CMD} bash build.sh build-revision ${GIT_TAG}
4132
@$(call build-install-script,${GIT_TAG})
4233

4334
build: build-tag build-revision

‎build.sh‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/usr/bin/env bash
2+
3+
build-tag(){
4+
CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -o _dist/$1/drycc-$1-linux-386 drycc.go
5+
CGO_ENABLED=0 GOOS=darwin GOARCH=386 go build -o _dist/$1/drycc-$1-darwin-386 drycc.go
6+
CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -o _dist/$1/drycc-$1-windows-386 drycc.go
7+
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o _dist/$1/drycc-$1-linux-amd64 drycc.go
8+
CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o _dist/$1/drycc-$1-darwin-amd64 drycc.go
9+
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o _dist/$1/drycc-$1-windows-amd64 drycc.go
10+
}
11+
12+
build-revision(){
13+
CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -o _dist/$1/drycc-$1-linux-386 drycc.go
14+
CGO_ENABLED=0 GOOS=darwin GOARCH=386 go build -o _dist/$1/drycc-$1-darwin-386 drycc.go
15+
CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -o _dist/$1/drycc-$1-windows-386 drycc.go
16+
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o _dist/$1/drycc-$1-linux-amd64 drycc.go
17+
CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o _dist/$1/drycc-$1-darwin-amd64 drycc.go
18+
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o _dist/$1/drycc-$1-windows-amd64 drycc.go
19+
}
20+
21+
echo "------------------$1 $2------------------"
22+
"$1" "$2"

‎go.mod‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
module github.com/drycc/workflow-cli
2+
3+
go 1.13
4+
5+
require (
6+
github.com/arschles/assert v1.0.0
7+
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
8+
github.com/drycc/controller-sdk-go v0.0.0-20190417134318-39a6c81f21f3
9+
github.com/drycc/pkg v0.0.0-20190129033019-bcdffff0fcb3
10+
github.com/goware/urlx v0.2.0 // indirect
11+
github.com/mattn/go-runewidth v0.0.4 // indirect
12+
github.com/olekukonko/tablewriter v0.0.1
13+
golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a
14+
golang.org/x/net v0.0.0-20190415214537-1da14a5a36f2 // indirect
15+
golang.org/x/sys v0.0.0-20190416152802-12500544f89f // indirect
16+
gopkg.in/yaml.v2 v2.2.2
17+
)

‎go.sum‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
2+
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
3+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
4+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
5+
github.com/arschles/assert v1.0.0 h1:NofQbRhtxcLgP+XoKunA7J6UMJNTqX7xR/19tej8UsA=
6+
github.com/arschles/assert v1.0.0/go.mod h1:m/u69zW43x0h8dTHcv3JJZljINyEYgBuf5fYJP6WikI=
7+
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=
8+
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
9+
github.com/drycc/controller-sdk-go v0.0.0-20190417134318-39a6c81f21f3 h1:SzH+2aP7vpfvyPWaKtkIPnGbhdTWIWL2mQzQuzqAS9k=
10+
github.com/drycc/controller-sdk-go v0.0.0-20190417134318-39a6c81f21f3/go.mod h1:bf3lPkMsCK+DmEd8wc1yk3Wj0pDPni6cqglR+jqo1Dc=
11+
github.com/drycc/pkg v0.0.0-20190129033019-bcdffff0fcb3 h1:QRAbL97/hJecXQzaSONMCiwt1JjBKAAMKK0qJW5sgIM=
12+
github.com/drycc/pkg v0.0.0-20190129033019-bcdffff0fcb3/go.mod h1:zNgTT6kuGZOKMIdSrjskIw5fctdbbszqiTPEt3ffxHw=
13+
github.com/goware/urlx v0.2.0 h1:E4bW8qSmhUgJ7Z5qY93mfN+IiUPXi66iua1Wza0wP7I=
14+
github.com/goware/urlx v0.2.0/go.mod h1:h8uwbJy68o+tQXCGZNa9D73WN8n0r9OBae5bUnLcgjw=
15+
github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
16+
github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
17+
github.com/olekukonko/tablewriter v0.0.1 h1:b3iUnf1v+ppJiOfNX4yxxqfWKMQPZR5yoh8urCTFX88=
18+
github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
19+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
20+
golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a h1:Igim7XhdOpBnWPuYJ70XcNpq8q3BCACtVgNfoJxOV7g=
21+
golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
22+
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
23+
golang.org/x/net v0.0.0-20190415214537-1da14a5a36f2 h1:iC0Y6EDq+rhnAePxGvJs2kzUAYcwESqdcGRPzEUfzTU=
24+
golang.org/x/net v0.0.0-20190415214537-1da14a5a36f2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
25+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
26+
golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
27+
golang.org/x/sys v0.0.0-20190416152802-12500544f89f h1:1ZH9RnjNgLzh6YrsRp/c6ddZ8Lq0fq9xztNOoWJ2sz4=
28+
golang.org/x/sys v0.0.0-20190416152802-12500544f89f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
29+
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
30+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
31+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
32+
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
33+
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

0 commit comments

Comments
 (0)