Skip to content

Commit

Permalink
chore: clean make and scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
ldez committed Oct 12, 2022
1 parent ace5ced commit 6890413
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 24 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.10.0-alpine
FROM golang:1.19-alpine

# cache buster
RUN echo 4
RUN echo 4

# git is needed for "go get" below
RUN apk add --no-cache git make
Expand Down Expand Up @@ -32,3 +32,4 @@ RUN /bin/true \
&& wget -O /scowl-wl/words-US-60.txt ${SOURCE_US} \
&& wget -O /scowl-wl/words-GB-ise-60.txt ${SOURCE_GB_ISE}

RUN git config --global --add safe.directory "/go/src/github.com/golangci/misspell"
15 changes: 4 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
CONTAINER=nickg/misspell
CONTAINER=golangci/misspell

default: lint test build

install: ## install misspell into GOPATH/bin
go install ./cmd/misspell

build: ## build and lint misspell
build: ## build misspell
go build ./cmd/misspell

test: ## run all tests
Expand All @@ -14,10 +14,6 @@ test: ## run all tests
lint: ## run linter
golangci-lint run

# real publishing is done only by travis
publish: ## test goreleaser
./scripts/goreleaser-dryrun.sh

# the grep in line 2 is to remove misspellings in the spelling dictionary
# that trigger false positives!!
falsepositives: /scowl-wl
Expand All @@ -42,19 +38,16 @@ clean: ## clean up time
go clean ./...
git gc --aggressive

ci: ## run test like travis-ci does, requires docker
ci: docker-build ## run test like travis-ci does, requires docker
docker run --rm \
-v $(PWD):/go/src/github.com/golangci/misspell \
-w /go/src/github.com/golangci/misspell \
${CONTAINER} \
make build falsepositives
make install falsepositives

docker-build: ## build a docker test image
docker build -t ${CONTAINER} .

docker-pull: ## pull latest test image
docker pull ${CONTAINER}

docker-console: ## log into the test image
docker run --rm -it \
-v $(PWD):/go/src/github.com/golangci/misspell \
Expand Down
3 changes: 1 addition & 2 deletions goreleaser.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
project_name: misspell

builds:
-
main: cmd/misspell/main.go
- main: cmd/misspell/main.go
binary: misspell
ldflags: -s -w -X main.version={{.Version}}
goos:
Expand Down
2 changes: 0 additions & 2 deletions scripts/commit-msg.sh

This file was deleted.

7 changes: 0 additions & 7 deletions scripts/goreleaser-dryrun.sh

This file was deleted.

0 comments on commit 6890413

Please sign in to comment.