Finish migration to GH Actions (#87)

* Finish migration to GH Actions Signed-off-by: Yuri Shkuro <[email protected]> * Always report coverage Signed-off-by: Yuri Shkuro <[email protected]> * Disable dep trying to update deps Signed-off-by: Yuri Shkuro <[email protected]> * Run dep ensure Signed-off-by: Yuri Shkuro <[email protected]> * pass vars Signed-off-by: Yuri Shkuro <[email protected]> * dep check Signed-off-by: Yuri Shkuro <[email protected]>
jaegertracing · Dec 13, 2020 · 78a0e7f · 78a0e7f
1 parent 8e6d08f
commit 78a0e7f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 72 deletions.
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -15,11 +15,9 @@ jobs:
         job:
         - dep: true
           glide: false
-          cov: true
           name: unit-tests with dep
         - dep: false
           glide: true
-          cov: false
           name: unit-tests with glide
     name: ${{ matrix.job.name }}
     steps:
@@ -36,11 +34,10 @@ jobs:
       - name: Run tests
         run: |
           cd $PROJECT
-          make test-ci
+          make test-ci USE_DEP=${{ matrix.job.dep }} USE_GLIDE=${{ matrix.job.glide }}
       - name: Upload coverage to codecov
         uses: codecov/codecov-action@v1
         with:
           file: cover.out
           fail_ci_if_error: true
           verbose: true
-        if: matrix.job.cov == 'true'
diff --git a/.travis.yml b/.travis.yml
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Makefile b/Makefile
@@ -25,11 +25,14 @@ COLORIZE=sed ''/PASS/s//$(PASS)/'' | sed ''/FAIL/s//$(FAIL)/''
 .PHONY: test-and-lint
 test-and-lint: test fmt lint
 
-.PHONY: test
-test:
+.PHONY: dep-check
+dep-check:
 ifeq ($(USE_DEP),true)
 	dep check
 endif
+
+.PHONY: test
+test: dep-check
 	$(GOTEST) $(PACKAGES) | $(COLORIZE)
 
 .PHONY: fmt
@@ -52,10 +55,12 @@ lint:
 install:
 ifeq ($(USE_DEP),true)
 	dep version || make install-dep
-	dep ensure
+	dep version
+	dep ensure -vendor-only
 	dep status
 else ifeq ($(USE_GLIDE),true)
 	glide --version || go get github.com/Masterminds/glide
+	glide --version
 	glide install
 endif
 
@@ -67,7 +72,6 @@ cover:
 cover-html: cover
 	go tool cover -html=cover.out -o cover.html
 
-
 idl-submodule:
 	git submodule init
 	git submodule update
@@ -77,7 +81,7 @@ thrift-image:
 
 .PHONY: install-dep
 install-dep:
-	- curl -L -s https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64 -o $$GOPATH/bin/dep
+	- curl -L -s https://github.com/golang/dep/releases/download/v0.5.4/dep-linux-amd64 -o $$GOPATH/bin/dep
 	- chmod +x $$GOPATH/bin/dep
 
 .PHONY: install-ci
@@ -88,4 +92,4 @@ install-ci: install
 	go get golang.org/x/lint/golint
 
 .PHONY: test-ci
-test-ci: cover lint
+test-ci: dep-check cover lint
diff --git a/README.md b/README.md
@@ -20,8 +20,8 @@ Please see [CONTRIBUTING.md](CONTRIBUTING.md).
 
 [doc-img]: https://godoc.org/github.com/uber/jaeger-lib?status.svg
 [doc]: https://godoc.org/github.com/uber/jaeger-lib
-[ci-img]: https://travis-ci.org/jaegertracing/jaeger-lib.svg?branch=master
-[ci]: https://travis-ci.org/jaegertracing/jaeger-lib
+[ci-img]: https://github.com/jaegertracing/jaeger-lib/workflows/Unit%20Tests/badge.svg?branch=master
+[ci]: https://github.com/jaegertracing/jaeger-lib/actions?query=branch%3Amaster
 [cov-img]: https://coveralls.io/repos/jaegertracing/jaeger-lib/badge.svg?branch=master&service=github
 [cov]: https://coveralls.io/github/jaegertracing/jaeger-lib?branch=master