Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into ronoaldo/issue184
Browse files Browse the repository at this point in the history
  • Loading branch information
ronoaldo committed Dec 7, 2023
2 parents c0975a4 + 035f5c1 commit 0091f6a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Tests
run: |
CGO_ENABLED=1 go build .
CGO_ENABLED=0 go build .
go test ./...
- name: Log in to the Container registry
Expand All @@ -58,6 +58,6 @@ jobs:
- name: Build and push latest docker image
if: success() && github.ref == 'refs/heads/master'
run: |
CGO_ENABLED=1 go build .
CGO_ENABLED=0 go build .
docker build . -t ghcr.io/minetest-go/mapcleaner:latest
docker push ghcr.io/minetest-go/mapcleaner:latest
3 changes: 2 additions & 1 deletion .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ before:
- go mod tidy
builds:
- env:
- CGO_ENABLED=1
- CGO_ENABLED=0
targets:
- linux_amd64
- windows_amd64
- darwin_arm64
- linux_arm_6
ldflags:
- -s -w -X main.Version={{.Version}}
changelog:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ WORKDIR /app
COPY ./go.* /app/
RUN go mod download
COPY ./*.go /app/
RUN go test ./... && CGO_ENABLED=1 go build
RUN go test ./... && CGO_ENABLED=0 go build

# minetest
FROM registry.gitlab.com/minetest/minetest/server:5.6.1
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/minetest-go/areasparser v1.0.0
github.com/minetest-go/mapparser v0.1.8
github.com/minetest-go/mtdb v1.1.45
github.com/minetest-go/mtdb v1.1.46
github.com/sirupsen/logrus v1.9.3
)

Expand Down

0 comments on commit 0091f6a

Please sign in to comment.