Skip to content
This repository was archived by the owner on Aug 17, 2025. It is now read-only.

Commit 78a0e7f

Browse files
authored
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]>
1 parent 8e6d08f commit 78a0e7f

File tree

5 files changed

+21
-72
lines changed

5 files changed

+21
-72
lines changed

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@ jobs:
1515
job:
1616
- dep: true
1717
glide: false
18-
cov: true
1918
name: unit-tests with dep
2019
- dep: false
2120
glide: true
22-
cov: false
2321
name: unit-tests with glide
2422
name: ${{ matrix.job.name }}
2523
steps:
@@ -36,11 +34,10 @@ jobs:
3634
- name: Run tests
3735
run: |
3836
cd $PROJECT
39-
make test-ci
37+
make test-ci USE_DEP=${{ matrix.job.dep }} USE_GLIDE=${{ matrix.job.glide }}
4038
- name: Upload coverage to codecov
4139
uses: codecov/codecov-action@v1
4240
with:
4341
file: cover.out
4442
fail_ci_if_error: true
4543
verbose: true
46-
if: matrix.job.cov == 'true'

.travis.yml

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

Gopkg.lock

Lines changed: 8 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Makefile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,14 @@ COLORIZE=sed ''/PASS/s//$(PASS)/'' | sed ''/FAIL/s//$(FAIL)/''
2525
.PHONY: test-and-lint
2626
test-and-lint: test fmt lint
2727

28-
.PHONY: test
29-
test:
28+
.PHONY: dep-check
29+
dep-check:
3030
ifeq ($(USE_DEP),true)
3131
dep check
3232
endif
33+
34+
.PHONY: test
35+
test: dep-check
3336
$(GOTEST) $(PACKAGES) | $(COLORIZE)
3437

3538
.PHONY: fmt
@@ -52,10 +55,12 @@ lint:
5255
install:
5356
ifeq ($(USE_DEP),true)
5457
dep version || make install-dep
55-
dep ensure
58+
dep version
59+
dep ensure -vendor-only
5660
dep status
5761
else ifeq ($(USE_GLIDE),true)
5862
glide --version || go get github.com/Masterminds/glide
63+
glide --version
5964
glide install
6065
endif
6166

@@ -67,7 +72,6 @@ cover:
6772
cover-html: cover
6873
go tool cover -html=cover.out -o cover.html
6974

70-
7175
idl-submodule:
7276
git submodule init
7377
git submodule update
@@ -77,7 +81,7 @@ thrift-image:
7781

7882
.PHONY: install-dep
7983
install-dep:
80-
- curl -L -s https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64 -o $$GOPATH/bin/dep
84+
- curl -L -s https://github.com/golang/dep/releases/download/v0.5.4/dep-linux-amd64 -o $$GOPATH/bin/dep
8185
- chmod +x $$GOPATH/bin/dep
8286

8387
.PHONY: install-ci
@@ -88,4 +92,4 @@ install-ci: install
8892
go get golang.org/x/lint/golint
8993

9094
.PHONY: test-ci
91-
test-ci: cover lint
95+
test-ci: dep-check cover lint

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ Please see [CONTRIBUTING.md](CONTRIBUTING.md).
2020

2121
[doc-img]: https://godoc.org/github.com/uber/jaeger-lib?status.svg
2222
[doc]: https://godoc.org/github.com/uber/jaeger-lib
23-
[ci-img]: https://travis-ci.org/jaegertracing/jaeger-lib.svg?branch=master
24-
[ci]: https://travis-ci.org/jaegertracing/jaeger-lib
23+
[ci-img]: https://github.com/jaegertracing/jaeger-lib/workflows/Unit%20Tests/badge.svg?branch=master
24+
[ci]: https://github.com/jaegertracing/jaeger-lib/actions?query=branch%3Amaster
2525
[cov-img]: https://coveralls.io/repos/jaegertracing/jaeger-lib/badge.svg?branch=master&service=github
2626
[cov]: https://coveralls.io/github/jaegertracing/jaeger-lib?branch=master
2727

0 commit comments

Comments
 (0)