From 87498c65afba83136226a157b49715f2100000ea Mon Sep 17 00:00:00 2001 From: Brandon Liu Date: Wed, 11 Sep 2024 10:15:02 +0800 Subject: [PATCH 1/2] Bump go to 1.23.1; make download cmd hidden --- Dockerfile | 2 +- go.mod | 2 +- main.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 63590d3..d213c4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.5-alpine3.19 AS builder +FROM golang:1.23.1-alpine3.19 AS builder COPY . /workspace WORKDIR /workspace ENV CGO_ENABLED=0 diff --git a/go.mod b/go.mod index a755c89..7255706 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/protomaps/go-pmtiles -go 1.22.5 +go 1.23.1 require ( cloud.google.com/go/storage v1.43.0 diff --git a/main.go b/main.go index 9e85b75..bff9e06 100644 --- a/main.go +++ b/main.go @@ -99,7 +99,7 @@ var cli struct { DownloadThreads int `default:"4" help:"Number of download threads."` DryRun bool `help:"Calculate new parts to download, but don't download them."` Overfetch float32 `default:"0.05" help:"What ratio of extra data to download to minimize # requests; 0.2 is 20%"` - } `cmd:"" help:"Upload a local archive to remote storage."` + } `cmd:"" help:"Download a local archive to remote storage." hidden:""` Upload struct { Input string `arg:"" type:"existingfile"` From 5151a67a33463080baac9328df0630d625eec2d0 Mon Sep 17 00:00:00 2001 From: Brandon Liu Date: Wed, 11 Sep 2024 10:21:14 +0800 Subject: [PATCH 2/2] change to go 1.22.7 --- .github/workflows/test.yml | 4 ++-- Dockerfile | 2 +- go.mod | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f34ab29..b226b80 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: "^1.21.0" + go-version: "^1.22.7" - run: go test ./pmtiles fmt_vet_lint: runs-on: ubuntu-latest @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: "^1.21.0" + go-version: "^1.22.7" - run: if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then exit 1; fi - run: go vet caddy/pmtiles_proxy.go - run: go vet main.go diff --git a/Dockerfile b/Dockerfile index d213c4f..994a1e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.1-alpine3.19 AS builder +FROM golang:1.22.7-alpine3.19 AS builder COPY . /workspace WORKDIR /workspace ENV CGO_ENABLED=0 diff --git a/go.mod b/go.mod index 7255706..97b4685 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/protomaps/go-pmtiles -go 1.23.1 +go 1.22.7 require ( cloud.google.com/go/storage v1.43.0