Skip to content

Commit

Permalink
internal/apps: remove go version workaround
Browse files Browse the repository at this point in the history
Remove go version workaround. This will be addressed by merging
#2871 first.

Use go1.23.0 instead of go1.23 since the latter includes pre-release
versions which we don't want here.
  • Loading branch information
felixge committed Sep 17, 2024
1 parent 8e3358e commit 121d0e3
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 12 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/smoke-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ jobs:
matrix:
# TODO: cross-compilation from/to different hardware architectures once
# github provides native ARM runners.
# NOTE: Also edit go_min below when changing the go versions here.
go: [ "1.22", "1.23" ]
build-env: [ alpine, bookworm, bullseye ]
build-with-cgo: [ 0, 1 ]
Expand Down Expand Up @@ -185,7 +184,6 @@ jobs:
tags: smoke-test
build-args: |
go=${{ matrix.go }}
go_min=1.22
build_env=${{ matrix.build-env }}
build_tags=${{ matrix.build-tags }}
build_with_vendoring=${{ matrix.build-with-vendoring }}
Expand Down
2 changes: 1 addition & 1 deletion internal/apps/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/DataDog/dd-trace-go/internal/apps

go 1.23
go 1.23.0

require (
golang.org/x/sync v0.7.0
Expand Down
9 changes: 0 additions & 9 deletions internal/apps/setup-smoke-test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,6 @@ RUN if [ "${go_libddwaf_ref}" != "" ]; then \
go get -u github.com/DataDog/go-libddwaf/v3@${go_libddwaf_ref}; \
fi


# internal/apps/go.mod is usually on the latest go version, but this would fail
# when we are testing against an older go version.
#
# TODO(fg) this is a workaround. We should probably move setup-smoke-test out
# of internal/apps and into a separate directory.
ARG go_min
RUN go mod edit -go="${go_min}"

RUN go mod tidy

ARG build_with_vendoring
Expand Down

0 comments on commit 121d0e3

Please sign in to comment.