Skip to content

Commit

Permalink
prepare 7.4.3 release (#282)
Browse files Browse the repository at this point in the history
## [7.4.3] - 2024-01-03
### Changed:
- Build with Go 1.21.5 and 1.20.12 in CI
- Bumped Alpine from 3.18 to 3.19
- Bumped go-git from 5.7.0 to 5.11.0 
- Bumped x/crypto from 0.14.0 to 0.17

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Eli Bishop <[email protected]>
Co-authored-by: LaunchDarklyReleaseBot <[email protected]>
Co-authored-by: Moshe Good <[email protected]>
Co-authored-by: Moshe Good <[email protected]>
Co-authored-by: LaunchDarklyCI <[email protected]>
Co-authored-by: hroederld <[email protected]>
Co-authored-by: Dan Richelson <[email protected]>
Co-authored-by: Dan Richelson <[email protected]>
Co-authored-by: Ben Woskow <[email protected]>
Co-authored-by: Ben Woskow <[email protected]>
Co-authored-by: Louis Chan <[email protected]>
Co-authored-by: Louis Chan <[email protected]>
Co-authored-by: Casey Waldren <[email protected]>
Co-authored-by: Phil Z <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthew M. Keeler <[email protected]>
Co-authored-by: Ember Stevens <[email protected]>
Co-authored-by: Molly <[email protected]>
Co-authored-by: ld-repository-standards[bot] <113625520+ld-repository-standards[bot]@users.noreply.github.com>
Co-authored-by: Kane Parkinson <[email protected]>
Co-authored-by: Ember Stevens <[email protected]>
Co-authored-by: Shalini Singh <[email protected]>
Co-authored-by: Shalini Singh <[email protected]>
Co-authored-by: Ryan Lamb <[email protected]>
  • Loading branch information
25 people authored Jan 3, 2024
1 parent d02aa54 commit d72f7da
Show file tree
Hide file tree
Showing 10 changed files with 58 additions and 26 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ parameters:
# override it in any parameterized builds, but just as a convenient shareable constant.
go-release-version:
type: string
default: "1.21.3"
default: "1.21.5"

# In addition to the most recent version of Go, we also support the previous version.
go-previous-version:
type: string
default: "1.20.10"
default: "1.20.12"

# We use a remote Docker host in some CI jobs that need to run Docker containers.
# As of 2022-04-15, the default Docker daemon version was 17.09.0-ce, which started
Expand Down
3 changes: 1 addition & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
project_name: ld-relay

run:
deadline: 120s
timeout: 120s
tests: false

linters:
enable:
- bodyclose
- depguard
- dupl
- errcheck
- goconst
Expand Down
2 changes: 1 addition & 1 deletion .ldrelease/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ repo:

jobs:
- docker:
image: cimg/go:1.21.3 # See "Runtime platform versions" in CONTRIBUTING.md
image: cimg/go:1.21.5 # See "Runtime platform versions" in CONTRIBUTING.md
copyGitHistory: true
template:
name: go
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This is a standalone Dockerfile that does not depend on goreleaser building the binary
# It is NOT the version that is pushed to dockerhub
FROM golang:1.21.3-alpine3.18 as builder
FROM golang:1.21.5-alpine3.19 as builder
# See "Runtime platform versions" in CONTRIBUTING.md

RUN apk --no-cache add \
Expand All @@ -21,7 +21,7 @@ ENV GOPATH=/go

RUN go build -a -o ldr .

FROM alpine:3.18.4
FROM alpine:3.19.0

RUN addgroup -g 1000 -S ldr-user && \
adduser -u 1000 -S ldr-user -G ldr-user && \
Expand All @@ -30,7 +30,7 @@ RUN addgroup -g 1000 -S ldr-user && \

RUN apk add --no-cache \
ca-certificates \
&& apk add --upgrade libcrypto1.1 libssl1.1 \
&& apk add --upgrade libcrypto3 libssl3 \
&& update-ca-certificates \
&& rm -rf /var/cache/apk/*

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.goreleaser
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

# See .ldrelease/config.yml for an explanation of the build/release process.

FROM alpine:3.18.4
FROM alpine:3.19.0
# See "Runtime platform versions" in CONTRIBUTING.md

RUN apk add --no-cache \
ca-certificates \
&& apk add --upgrade libcrypto1.1 libssl1.1 \
&& apk add --upgrade libcrypto3 libssl3 \
&& update-ca-certificates \
&& rm -rf /var/cache/apk/*

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

GOLANGCI_LINT_VERSION=v1.51.2
GOLANGCI_LINT_VERSION=v1.55.2

LINTER=./bin/golangci-lint
LINTER_VERSION_FILE=./bin/.golangci-lint-version-$(GOLANGCI_LINT_VERSION)
Expand Down
27 changes: 14 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ require (
github.com/prometheus/client_golang v1.15.1 // indirect; override to address CVE-2022-21698
github.com/stretchr/testify v1.8.4
go.opencensus.io v0.24.0
golang.org/x/net v0.18.0
golang.org/x/sync v0.2.0
golang.org/x/net v0.19.0
golang.org/x/sync v0.5.0
gopkg.in/gcfg.v1 v1.2.3
gopkg.in/launchdarkly/go-server-sdk.v5 v5.10.1
)
Expand Down Expand Up @@ -76,6 +76,7 @@ require (
cloud.google.com/go/storage v1.29.0 // indirect
cloud.google.com/go/trace v1.9.0 // indirect
code.gitea.io/sdk/gitea v0.15.1 // indirect
dario.cat/mergo v1.0.0 // indirect
github.com/AlekSi/pointer v1.2.0 // indirect
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.3.1 // indirect
Expand All @@ -101,7 +102,7 @@ require (
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230528122434-6f98819771a1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect
github.com/acomagu/bufpipe v1.0.4 // indirect
github.com/alessio/shellescape v1.4.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
Expand Down Expand Up @@ -131,7 +132,7 @@ require (
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/charmbracelet/lipgloss v0.6.0 // indirect
github.com/chrismellard/docker-credential-acr-env v0.0.0-20220327082430-c57b701bfc08 // indirect
github.com/cloudflare/circl v1.3.3 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
Expand All @@ -153,8 +154,8 @@ require (
github.com/emirpasic/gods v1.18.1 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.4.1 // indirect
github.com/go-git/go-git/v5 v5.7.0 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-git/go-git/v5 v5.11.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-openapi/analysis v0.21.4 // indirect
Expand All @@ -173,7 +174,7 @@ require (
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-containerregistry v0.14.0 // indirect
github.com/google/go-github/v50 v50.0.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
Expand Down Expand Up @@ -250,7 +251,7 @@ require (
github.com/sigstore/rekor v1.2.0 // indirect
github.com/sigstore/sigstore v1.6.4 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/skeema/knownhosts v1.1.1 // indirect
github.com/skeema/knownhosts v1.2.1 // indirect
github.com/slack-go/slack v0.12.1 // indirect
github.com/spf13/afero v1.9.3 // indirect
github.com/spf13/cast v1.5.0 // indirect
Expand All @@ -272,14 +273,14 @@ require (
gitlab.com/digitalxero/go-conventional-commit v1.0.7 // indirect
go.mongodb.org/mongo-driver v1.11.3 // indirect
gocloud.dev v0.29.0 // indirect
golang.org/x/crypto v0.15.0 // indirect
golang.org/x/mod v0.11.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/term v0.14.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.9.3 // indirect
golang.org/x/tools v0.16.1 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.121.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
Expand Down
Loading

0 comments on commit d72f7da

Please sign in to comment.