Merge pull request #260 from dagger/golangci-gh-action
ci: use golangci github action
This commit is contained in:
commit
6820b99637
14
.github/workflows/ci.yml
vendored
14
.github/workflows/ci.yml
vendored
@ -27,12 +27,20 @@ jobs:
|
||||
echo "Installing cue version $CUE_VERSION"
|
||||
curl -L https://github.com/cuelang/cue/releases/download/${CUE_VERSION}/${CUE_TARBALL} | sudo tar zxf - -C /usr/local/bin
|
||||
|
||||
# golangci
|
||||
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sudo sh -s -- -b /usr/local/bin v1.23.8
|
||||
- name: Go Lint
|
||||
uses: golangci/golangci-lint-action@v2
|
||||
with:
|
||||
version: v1.39
|
||||
skip-go-installation: true
|
||||
args: --timeout=3m
|
||||
|
||||
- name: Cue Lint
|
||||
run: |
|
||||
make cuelint
|
||||
|
||||
- name: Lint
|
||||
run: |
|
||||
make lint
|
||||
make check-buildkit-version
|
||||
|
||||
test:
|
||||
name: Test
|
||||
|
@ -26,7 +26,7 @@ linters:
|
||||
- nakedret
|
||||
- prealloc
|
||||
- rowserrcheck
|
||||
- scopelint
|
||||
- exportloopref
|
||||
- staticcheck
|
||||
- structcheck
|
||||
- stylecheck
|
||||
|
12
Makefile
12
Makefile
@ -13,17 +13,23 @@ dagger-debug:
|
||||
test:
|
||||
go test -race -v ./...
|
||||
|
||||
.PHONY: golint
|
||||
golint:
|
||||
golangci-lint run --timeout 3m
|
||||
|
||||
.PHONY: cuefmt
|
||||
cuefmt:
|
||||
@(cue fmt -s ./stdlib/...)
|
||||
@(cue fmt -s ./examples/*/)
|
||||
@(cue fmt -s ./tests/...)
|
||||
|
||||
.PHONY: lint
|
||||
lint: cuefmt check-buildkit-version
|
||||
golangci-lint run --timeout 3m
|
||||
.PHONY: cuelint
|
||||
cuelint: cuefmt
|
||||
@test -z "$$(git status -s . | grep -e "^ M" | grep .cue | cut -d ' ' -f3 | tee /dev/stderr)"
|
||||
|
||||
.PHONY: lint
|
||||
lint: cuelint golint check-buildkit-version
|
||||
|
||||
.PHONY: check-buildkit-version
|
||||
check-buildkit-version:
|
||||
@test \
|
||||
|
@ -103,7 +103,7 @@ func (s *Store) syncDeployment(r *DeploymentState) error {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := os.WriteFile(p, data, 0644); err != nil {
|
||||
if err := os.WriteFile(p, data, 0600); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user