chore(workflow-cli): remove git dependency

Author: duanhongyi

.drone/drone.yaml .drone/drone.yml.drone/drone.yaml renamed to .drone/drone.yml

@@ -9,8 +9,11 @@ steps:
   privileged: true
   commands:
   - nohup dockerd &
-  - apk add make bash curl git
-  - make test
+  - apk add make bash curl
+  - VERSION=${DRONE_TAG:-latest} make test 
+  environment:
+    DEV_REGISTRY:
+      from_secret: dev_registry
   when:
     event:
     - push
@@ -23,9 +26,11 @@ steps:
   privileged: true
   commands:
   - nohup dockerd &
-  - apk add make bash curl git
-  - make build-tag
-  - mv _dist/$DRONE_TAG dist
+  - apk add make bash curl
+  - VERSION=${DRONE_TAG:-latest} make build
+  environment:
+    DEV_REGISTRY:
+      from_secret: dev_registry
   when:
     event:
     - tag
@@ -35,7 +40,7 @@ steps:
   settings:
     api_key:
       from_secret: github_token
-    files: dist/*
+    files: _dist/*
   when:
     event: tag
 

Makefile

@@ -1,43 +1,29 @@
 # the filepath to this repository, relative to $GOPATH/src
 REPO_PATH := github.com/drycc/workflow-cli
-DEV_ENV_IMAGE := drycc/go-dev
+DEV_ENV_IMAGE := ${DEV_REGISTRY}/drycc/go-dev
 DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 
-# The latest git tag on branch
-GIT_TAG ?= $(shell git describe --abbrev=0 --tags)
-REVISION ?= $(shell git rev-parse --short HEAD)
-
-REGISTRY ?=
-IMAGE_PREFIX ?= drycc
-IMAGE := ${REGISTRY}${IMAGE_PREFIX}/workflow-cli-dev:${REVISION}
-
 DIST_DIR ?= _dist
 
 DEV_ENV_CMD := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}
 
 define build-install-script
-  sed "s|{{DRYCC-CLIENT-VERSION}}|${GIT_TAG}|g" "install.tmpl" > "${DIST_DIR}/$(1)/install-drycc.sh"
+  sed "s|{{DRYCC-CLIENT-VERSION}}|${GIT_TAG}|g" "install.tmpl" > "${DIST_DIR}/install-drycc.sh"
 endef
 
 bootstrap:
 	${DEV_ENV_CMD} go mod vendor
 
 # This is supposed to be run within a docker container
-build-revision:
-	${DEV_ENV_CMD} scripts/build ${REVISION}
-
-# This is supposed to be run within a docker container
-build-tag:
-	${DEV_ENV_CMD} scripts/build ${GIT_TAG}
-	@$(call build-install-script,${GIT_TAG})
-
-build: build-tag build-revision
+build:
+	${DEV_ENV_CMD} scripts/build ${VERSION}
+	@$(call build-install-script,${VERSION})
 
 test-style:
 	${DEV_ENV_CMD} lint
 
 test-cover:
 	${DEV_ENV_CMD} test-cover.sh
 
-test: build-revision test-style test-cover
+test: build test-style test-cover
 	${DEV_ENV_CMD} go test ./...

scripts/build

@@ -5,7 +5,7 @@ go-build(){
     GOOS=$GOOS \
     GOARCH=$GOARCH \
     go build \
-    -o _dist/$1/drycc-$1-$GOOS-$GOARCH \
+    -o _dist/drycc-$1-$GOOS-$GOARCH \
     drycc.go
 }