Cleanup CI image

nhooyr · nhooyr · commit b0ac42c3873c · 2019-10-14T17:08:43.000-04:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,19 +4,19 @@ on: [push]
 jobs:
   fmt:
     runs-on: ubuntu-latest
-    container: nhooyr/websocket-ci@sha256:ea94e078d2d589d654a2c759d952bf4199c754d80dadb20696dc3902359027cb
+    container: nhooyr/websocket-ci@sha256:046cd02e79dcbf81dc06eb6fd333fa8643f2503f437ddd46a4c1af9132078a2c
     steps:
       - uses: actions/checkout@v1
       - run: make fmt
   lint:
     runs-on: ubuntu-latest
-    container: nhooyr/websocket-ci@sha256:ea94e078d2d589d654a2c759d952bf4199c754d80dadb20696dc3902359027cb
+    container: nhooyr/websocket-ci@sha256:046cd02e79dcbf81dc06eb6fd333fa8643f2503f437ddd46a4c1af9132078a2c
     steps:
       - uses: actions/checkout@v1
       - run: make lint
   test:
     runs-on: ubuntu-latest
-    container: nhooyr/websocket-ci@sha256:ea94e078d2d589d654a2c759d952bf4199c754d80dadb20696dc3902359027cb
+    container: nhooyr/websocket-ci@sha256:046cd02e79dcbf81dc06eb6fd333fa8643f2503f437ddd46a4c1af9132078a2c
     steps:
       - uses: actions/checkout@v1
       - run: make test
diff --git a/Makefile b/Makefile
@@ -13,5 +13,5 @@ include ci/lint.mk
 include ci/test.mk
 
 ci-image:
-	docker build -f ./ci/image/Dockerfile -t nhooyr/websocket-ci .
+	docker build -f ./ci/Dockerfile -t nhooyr/websocket-ci .
 	docker push nhooyr/websocket-ci
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![GitHub Release](https://img.shields.io/github/v/release/nhooyr/websocket?color=6b9ded&sort=semver)](https://github.com/nhooyr/websocket/releases)
 [![GoDoc](https://godoc.org/nhooyr.io/websocket?status.svg)](https://godoc.org/nhooyr.io/websocket)
-[![Codecov](https://img.shields.io/coveralls/github/nhooyr/websocket?color=65d6a4)](https://coveralls.io/github/nhooyr/websocket)
+[![Coveralls](https://img.shields.io/coveralls/github/nhooyr/websocket?color=65d6a4)](https://coveralls.io/github/nhooyr/websocket)
 [![Actions Status](https://github.com/nhooyr/websocket/workflows/ci/badge.svg)](https://github.com/nhooyr/websocket/actions)
 
 websocket is a minimal and idiomatic WebSocket library for Go.
diff --git a/ci/Dockerfile b/ci/Dockerfile
@@ -11,8 +11,6 @@ ENV PAGER=cat
 ENV CI=true
 ENV MAKEFLAGS="--jobs=8 --output-sync=target"
 
-COPY ./ci/image/gitignore /root/.config/git/ignore
-
 RUN npm install -g prettier
 RUN go get golang.org/x/tools/cmd/stringer
 RUN go get golang.org/x/tools/cmd/goimports
diff --git a/ci/image/gitignore b/ci/image/gitignore
diff --git a/ci/test.mk b/ci/test.mk
@@ -8,6 +8,8 @@ ci/out/coverage.html: gotest
 
 coveralls: gotest
 	echo "--- coveralls"
+	export GIT_BRANCH=$${GITHUB_REF}
+	export BUILD_NUMBER=$${GITHUB_ACTION}
 	goveralls -coverprofile=ci/out/coverage.prof -service=github-actions
 
 gotest:
