Skip to content

Commit

Permalink
.project directory
Browse files Browse the repository at this point in the history
  • Loading branch information
dnephin committed Aug 6, 2022
1 parent e8ca43d commit 9bab80b
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,13 @@ jobs:
steps:
run:
name: build binaries
command: bin/goreleaser --rm-dist --snapshot
command: bin/goreleaser --rm-dist --snapshot --config .project/goreleaser.yml
- when:
condition: << parameters.publish >>
steps:
run:
name: build and publish binaries
command: bin/goreleaser --rm-dist --skip-validate
command: bin/goreleaser --rm-dist --skip-validate --config .project/goreleaser.yml
- store_artifacts:
path: ./dist
destination: dist
Expand Down
4 changes: 1 addition & 3 deletions Dockerfile → .project/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

ARG GOLANG_VERSION
FROM golang:${GOLANG_VERSION:-1.14-alpine} as golang
FROM golang:${GOLANG_VERSION:-1.18-alpine} as golang
RUN apk add -U curl git bash
ENV CGO_ENABLED=0 \
PS1="# " \
Expand All @@ -11,13 +11,11 @@ USER ${UID}:${UID}


FROM golang as tools
RUN go get github.com/dnephin/[email protected]
RUN wget -O- -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s && \
mv bin/golangci-lint /go/bin


FROM golang as dev
COPY --from=tools /go/bin/filewatcher /usr/bin/filewatcher
COPY --from=tools /go/bin/golangci-lint /usr/bin/golangci-lint


Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ output. `./binary.test` is the path to the compiled test binary. The `-test.v`
must be included so that `go tool test2json` receives all the output.

To execute a test binary without installing Go, see
[running without go](./docs/running-without-go.md).
[running without go](./.project/docs/running-without-go.md).


### Finding and skipping slow tests
Expand Down
4 changes: 2 additions & 2 deletions do
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ update-golden() {
}

lint() {
golangci-lint run -v
golangci-lint run -v --config .project/golangci-lint.yml
}

go-mod-tidy() {
Expand Down Expand Up @@ -47,7 +47,7 @@ shell() {
_docker-build-dev() {
set -e
local idfile=".plsdo/docker-build-dev-image-id-${GOLANG_VERSION-default}"
local dockerfile=Dockerfile
local dockerfile=.project/Dockerfile
local tag=gotest.tools/gotestsum/builder
if [ -f "$idfile" ] && [ "$dockerfile" -ot "$idfile" ]; then
cat "$idfile"
Expand Down
Binary file removed docs/demo.gif
Binary file not shown.

0 comments on commit 9bab80b

Please sign in to comment.