diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 420f569615..973db5f737 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -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 ] @@ -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 }} diff --git a/internal/apps/go.mod b/internal/apps/go.mod index f634ac71a4..df92a0415a 100644 --- a/internal/apps/go.mod +++ b/internal/apps/go.mod @@ -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 diff --git a/internal/apps/setup-smoke-test/Dockerfile b/internal/apps/setup-smoke-test/Dockerfile index 71adf071b9..72b451e8bd 100644 --- a/internal/apps/setup-smoke-test/Dockerfile +++ b/internal/apps/setup-smoke-test/Dockerfile @@ -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