Skip to content

Commit

Permalink
ci cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
cplee committed Feb 24, 2020
1 parent 037e08a commit 3a65967
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 44 deletions.
7 changes: 0 additions & 7 deletions .github/workflows/integration/Dockerfile

This file was deleted.

8 changes: 0 additions & 8 deletions .github/workflows/integration/action.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .github/workflows/integration/entrypoint.sh

This file was deleted.

9 changes: 0 additions & 9 deletions .github/workflows/lint/Dockerfile

This file was deleted.

8 changes: 0 additions & 8 deletions .github/workflows/lint/action.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .github/workflows/lint/entrypoint.sh

This file was deleted.

15 changes: 13 additions & 2 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,25 @@ name: push
on: push

jobs:
ci:
lint:
runs-on: ubuntu-latest
steps:
- run: echo ${{github.ref}}
- uses: actions/checkout@v2
- uses: docker://golangci/golangci-lint:v1.23.6
with:
args: golangci-lint run
env:
CGO_ENABLED: 0

test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ./.github/workflows/lint
- uses: actions/setup-go@v1
with:
go-version: 1.13
- run: go test -cover ./...
env:
CGO_ENABLED: 0
GOFLAGS: -mod=vendor
3 changes: 2 additions & 1 deletion .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ on:

jobs:
release:
if: startsWith(github.ref, "v")
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Run GoReleaser
- name: GoReleaser
uses: goreleaser/goreleaser-action@v1
with:
version: latest
Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ endif
IS_SNAPSHOT = $(if $(findstring -, $(VERSION)),true,false)
TAG_VERSION = v$(VERSION)

ACT ?= go run -mod=vendor main.go
ACT ?= go run main.go
export GITHUB_TOKEN = $(shell cat ~/.config/github/token)

check:
@golangci-lint run
@go test -cover ./...
$(ACT) -P ubuntu-latest=nektos/act-environments-ubuntu:18.04

build: check
$(eval export SNAPSHOT_VERSION=$(VERSION))
Expand Down

0 comments on commit 3a65967

Please sign in to comment.