Skip to content

Commit 8443a83

Browse files
committed
ci: remove Travis CI and fix some issues with Github Actions
Let's join the 21st century. Signed-off-by: Dan Williams <[email protected]>
1 parent a1eed65 commit 8443a83

File tree

5 files changed

+3
-55
lines changed

5 files changed

+3
-55
lines changed

.github/workflows/test.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ jobs:
2424
for arch in ${LINUX_ARCHES}; do
2525
echo "Building for arch $arch"
2626
GOARCH=$arch make
27-
rm bin/*
2827
done
2928
3029
test-linux:
@@ -41,13 +40,11 @@ jobs:
4140
env:
4241
GO111MODULE: off
4342
run: |
44-
go get golang.org/x/tools/cmd/cover
4543
go get github.com/modocache/gover
4644
go get github.com/mattn/goveralls
47-
go get -t ./...
4845
4946
- name: test
50-
run: PATH=$PATH:$(go env GOPATH)/bin COVERALLS=1 ./test_linux.sh
47+
run: PATH=$PATH:$(go env GOPATH)/bin COVERALLS=1 make check
5148

5249
- name: Send coverage to coveralls
5350
env:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
*.o
33
*.orig
44
ocicnitool
5+
*.coverprofile

.travis.yml

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

hack/test-go.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ if [ ! -z "${COVERALLS:-""}" ]; then
1616
testrun "-covermode set -coverprofile ${i}.coverprofile ${t}"
1717
i=$((i+1))
1818
done
19-
gover
20-
goveralls -service=travis-ci -coverprofile=gover.coverprofile
2119
else
2220
echo "without coverage profile generation..."
2321
testrun "./..."

pkg/ocicni/ocicni.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ func buildCNIRuntimeConf(podNetwork *PodNetwork, ifName string, runtimeConfig Ru
810810
}
811811

812812
// Propagate existing CNI_ARGS to non-k8s consumers
813-
for _, kvpairs := range strings.Split(os.Getenv("CNI_ARGS"), ";"){
813+
for _, kvpairs := range strings.Split(os.Getenv("CNI_ARGS"), ";") {
814814
if keyval := strings.SplitN(kvpairs, "=", 2); len(keyval) == 2 {
815815
rt.Args = append(rt.Args, [2]string{keyval[0], keyval[1]})
816816
}

0 commit comments

Comments
 (0)