Skip to content

Commit

Permalink
Fix lint CI
Browse files Browse the repository at this point in the history
  • Loading branch information
maxcnunes committed Aug 8, 2022
1 parent 90f855c commit f0479bb
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 32 deletions.
19 changes: 10 additions & 9 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,16 @@ jobs:
matrix:
os:
- ubuntu-latest
- macos-latest
- windows-latest
# - macos-latest
# - windows-latest
go:
- '1.19'
- '1.18'
- '1.17'
- '1.16'
- '1.15'
# - '1.18'
# - '1.17'
# - '1.16'
# - '1.15'
env:
OS: ${{ matrix.os }}
PYTHON: '3.7'
steps:
- uses: actions/checkout@master

Expand All @@ -26,8 +25,10 @@ jobs:
with:
go-version: ${{ matrix.go }}

- name: Lint
run: make setup && make lint
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.48

- name: Test
run: make test
Expand Down
18 changes: 3 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,14 @@ TEST_PACKAGES := $(shell go list ./... | grep -v cmd)
COVER_PACKAGES := $(shell go list ./... | grep -v cmd | paste -sd "," -)
LINTER := $(shell command -v gometalinter 2> /dev/null)

.PHONY: setup

setup:
ifndef LINTER
@echo "Installing linter"
@go get -u github.com/alecthomas/gometalinter
@gometalinter --install
endif

build:
@go build -o ./gaper cmd/gaper/main.go

## lint: Validate golang code
# Install it following this doc https://golangci-lint.run/usage/install/#local-installation,
# please use the same version from .github/workflows/workflow.yml.
lint:
@gometalinter \
--deadline=120s \
--line-length=120 \
--enable-all \
--disable=gochecknoinits --disable=gochecknoglobals \
--vendor ./...
@golangci-lint run

test:
@go test -p=1 -coverpkg $(COVER_PACKAGES) \
Expand Down
1 change: 0 additions & 1 deletion builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ type Builder interface {
type builder struct {
dir string
binary string
errors string
wd string
buildArgs []string
}
Expand Down
4 changes: 1 addition & 3 deletions gaper.go
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,7 @@ func setupConfig(cfg *Config) error {
var extensions []string
for i := range cfg.Extensions {
values := strings.Split(cfg.Extensions[i], ",")
for _, e := range values {
extensions = append(extensions, e)
}
extensions = append(extensions, values...)
}
cfg.Extensions = extensions

Expand Down
13 changes: 9 additions & 4 deletions watcher_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,19 @@ func TestWatcherWatchChange(t *testing.T) {
time.Sleep(time.Millisecond * 500)

// update hidden files and dirs to check builtin hidden ignore is working
os.Chtimes(hiddenfile1, time.Now(), time.Now())
os.Chtimes(hiddenfile2, time.Now(), time.Now())
err = os.Chtimes(hiddenfile1, time.Now(), time.Now())
assert.Nil(t, err, "chtimes error")

err = os.Chtimes(hiddenfile2, time.Now(), time.Now())
assert.Nil(t, err, "chtimes error")

// update testfile first to check ignore is working
os.Chtimes(testfile, time.Now(), time.Now())
err = os.Chtimes(testfile, time.Now(), time.Now())
assert.Nil(t, err, "chtimes error")

time.Sleep(time.Millisecond * 500)
os.Chtimes(mainfile, time.Now(), time.Now())
err = os.Chtimes(mainfile, time.Now(), time.Now())
assert.Nil(t, err, "chtimes error")

select {
case event := <-w.Events():
Expand Down

0 comments on commit f0479bb

Please sign in to comment.