Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update holster, Golang to 1.22. #210

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# See https://github.com/mailgun/dockerworld/images for current pinned version

# This creates an cached layer of our dependencies for subsequent builds to use
FROM golang:1.18.3 AS deps
FROM golang:1.22 AS deps
WORKDIR /go/src
RUN --mount=type=bind,target=/go/src,rw go mod download

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build_and_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,41 +14,41 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the repo
uses: actions/checkout@v3
uses: actions/checkout@v4
# Create a build container which buildx will use as a driver when building the container.
# See https://github.com/docker/buildx/blob/master/docs/reference/buildx_create.md#driver
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
# Enables host networking which allows tests run by buildx to access
# the containers started by docker compose on localhost
driver-opts: network=host
# Login to the registry
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.PKG_WRITER_PAT }}
Baliedge marked this conversation as resolved.
Show resolved Hide resolved
# This creates a cache for the current PR, if none exists then
# the cache from the most recent PR will be used.
- name: Setup Docker layer Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-docker-${{ github.event.number }}
restore-keys: ${{ runner.os }}-docker-
# Automagically extract useful information from the current github context and creates
# a set of labels for use by build-push-action to be attached to the final image.
- name: Extract Metadata for Docker
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ github.repository }}
id: meta
# This action runs Buildx, which allows for a more complex Dockerfile.
# We use a buildx Dockerfile to run tests as well as build the final image.
- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
# We change the path context here since the github context does not include
# changes to local files, like when we download `Dockerfile`.
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test_on_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v5
with:
go-version: 1.17
go-version-file: 'go.mod'

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.PKG_WRITER_PAT }}

- name: Cache deps
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
Expand Down
58 changes: 44 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,29 +1,59 @@
module github.com/mailgun/kafka-pixy

go 1.16
go 1.22

toolchain go1.22.2

require (
github.com/Shopify/sarama v1.23.1
github.com/davecgh/go-spew v1.1.1
github.com/fatih/structs v1.1.0 // indirect
github.com/go-ini/ini v1.46.0 // indirect
github.com/gorilla/mux v1.8.0
github.com/mailgun/holster/v4 v4.0.0
github.com/mailgun/holster/v4 v4.18.1-0.20240422160847-5fbf4e2bb631
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e
github.com/onsi/ginkgo v1.9.0 // indirect
github.com/onsi/gomega v1.6.0 // indirect
github.com/pkg/errors v0.9.1
github.com/samuel/go-zookeeper v0.0.0-20190810000440-0ceca61e4d75
github.com/sirupsen/logrus v1.8.1
github.com/sirupsen/logrus v1.9.2
github.com/stretchr/testify v1.8.4
github.com/thrawn01/args v0.3.0
golang.org/x/net v0.18.0
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.31.0
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798 // indirect
github.com/eapache/go-resiliency v1.1.0 // indirect
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
github.com/eapache/queue v1.1.0 // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/fsnotify/fsnotify v1.4.7 // indirect
github.com/go-ini/ini v1.46.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/hashicorp/go-uuid v1.0.2 // indirect
github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/onsi/ginkgo v1.9.0 // indirect
github.com/onsi/gomega v1.6.0 // indirect
github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect
github.com/spf13/cast v1.3.0 // indirect
github.com/stretchr/testify v1.7.0
github.com/thrawn01/args v0.3.0
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
google.golang.org/grpc v1.39.0
google.golang.org/protobuf v1.27.1
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15
golang.org/x/crypto v0.15.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
gopkg.in/ini.v1 v1.46.0 // indirect
gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect
gopkg.in/jcmturner/dnsutils.v1 v1.0.1 // indirect
gopkg.in/jcmturner/goidentity.v3 v3.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0
gopkg.in/jcmturner/gokrb5.v7 v7.2.3 // indirect
gopkg.in/jcmturner/rpc.v1 v1.1.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading
Loading