Skip to content

Commit

Permalink
ci: remove Travis CI and fix some issues with Github Actions
Browse files Browse the repository at this point in the history
Let's join the 21st century.

Signed-off-by: Dan Williams <[email protected]>
  • Loading branch information
dcbw committed Mar 30, 2021
1 parent 203ee57 commit b734c89
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 55 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ jobs:
for arch in ${LINUX_ARCHES}; do
echo "Building for arch $arch"
GOARCH=$arch make
rm bin/*
done
test-linux:
Expand All @@ -41,13 +40,11 @@ jobs:
env:
GO111MODULE: off
run: |
go get golang.org/x/tools/cmd/cover
go get github.com/modocache/gover
go get github.com/mattn/goveralls
go get -t ./...
- name: test
run: PATH=$PATH:$(go env GOPATH)/bin COVERALLS=1 ./test_linux.sh
run: PATH=$PATH:$(go env GOPATH)/bin COVERALLS=1 make check

- name: Send coverage to coveralls
env:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
*.o
*.orig
ocicnitool
*.coverprofile
48 changes: 0 additions & 48 deletions .travis.yml

This file was deleted.

2 changes: 0 additions & 2 deletions hack/test-go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ if [ ! -z "${COVERALLS:-""}" ]; then
testrun "-covermode set -coverprofile ${i}.coverprofile ${t}"
i=$((i+1))
done
gover
goveralls -service=travis-ci -coverprofile=gover.coverprofile
else
echo "without coverage profile generation..."
testrun "./..."
Expand Down
2 changes: 1 addition & 1 deletion pkg/ocicni/ocicni.go
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@ func buildCNIRuntimeConf(podNetwork *PodNetwork, ifName string, runtimeConfig Ru
}

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

0 comments on commit b734c89

Please sign in to comment.