From b1ed61b9b321ac36eb193cfa2ca2a43fa791d216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dario=20Casta=C3=B1=C3=A9?= Date: Tue, 27 Aug 2024 18:33:48 +0200 Subject: [PATCH] fix: remove Go 1.20 support --- .github/workflows/appsec.yml | 4 ++-- .github/workflows/main-branch-tests.yml | 4 ++-- .github/workflows/parametric-tests.yml | 2 +- .github/workflows/pull-request.yml | 2 +- .github/workflows/smoke-tests.yml | 2 +- .gitlab/macrobenchmarks.yml | 12 ++++++------ pinddtrace.go | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/appsec.yml b/.github/workflows/appsec.yml index e9b7f19d21..6e30ebfe85 100644 --- a/.github/workflows/appsec.yml +++ b/.github/workflows/appsec.yml @@ -98,7 +98,7 @@ jobs: strategy: matrix: runs-on: [ macos-11, macos-14 ] # oldest and newest macos runners available - macos-14 mainly is here to cover the fact it is an ARM machine - go-version: [ "1.22", "1.21", "1.20" ] + go-version: [ "1.23", "1.22" ] fail-fast: true # saving some CI time - macos runners too long to get steps: - uses: actions/checkout@v4 @@ -211,7 +211,7 @@ jobs: needs: go-mod-caching strategy: matrix: - go-version: [ "1.22", "1.21", "1.20" ] + go-version: [ "1.23", "1.22" ] distribution: [ bookworm, bullseye, buster, alpine ] platform: [ linux/amd64, linux/arm64 ] exclude: diff --git a/.github/workflows/main-branch-tests.yml b/.github/workflows/main-branch-tests.yml index b681aaa9b7..b0436a5a93 100644 --- a/.github/workflows/main-branch-tests.yml +++ b/.github/workflows/main-branch-tests.yml @@ -22,7 +22,7 @@ jobs: unit-integration-tests: strategy: matrix: - go-version: ["1.20", "1.21", "1.22"] + go-version: ["1.22", "1.23"] fail-fast: false uses: ./.github/workflows/unit-integration-tests.yml with: @@ -33,7 +33,7 @@ jobs: strategy: matrix: runs-on: [ macos-latest, windows-latest, ubuntu-latest ] - go-version: ["1.20", "1.21", "1.22"] + go-version: ["1.22", "1.23"] fail-fast: false uses: ./.github/workflows/multios-unit-tests.yml with: diff --git a/.github/workflows/parametric-tests.yml b/.github/workflows/parametric-tests.yml index d797fd010f..594c8b4cc2 100644 --- a/.github/workflows/parametric-tests.yml +++ b/.github/workflows/parametric-tests.yml @@ -43,7 +43,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: "1.20" + go-version: "1.22" - name: Build runner uses: ./.github/actions/install_runner diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index ad5016b050..9513b2e328 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -18,6 +18,6 @@ jobs: name: PR Unit and Integration Tests uses: ./.github/workflows/unit-integration-tests.yml with: - go-version: "1.20" + go-version: "1.22" ref: ${{ github.ref }} secrets: inherit diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 98491d463d..a0526759ce 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -106,7 +106,7 @@ jobs: matrix: # TODO: cross-compilation from/to different hardware architectures once # github provides native ARM runners. - go: [ "1.20", "1.21", "1.22" ] + go: [ "1.22", "1.23" ] build-env: [ alpine, bookworm, bullseye ] build-with-cgo: [ 0, 1 ] deployment-env: [ alpine, debian11, debian12, al2, al2023, busybox, scratch ] diff --git a/.gitlab/macrobenchmarks.yml b/.gitlab/macrobenchmarks.yml index 0b60a295d4..8f750cfe62 100644 --- a/.gitlab/macrobenchmarks.yml +++ b/.gitlab/macrobenchmarks.yml @@ -109,7 +109,7 @@ go120-baseline: ENABLE_PROFILING: "false" ENABLE_APPSEC: "false" DD_PROFILING_EXECUTION_TRACE_ENABLED: "false" - GO_VERSION: "1.20.14" + GO_VERSION: "1.21.13" LOAD_TESTS: normal_operation_io-bound,high_load_io-bound|normal_operation_cpu-bound,high_load_cpu-bound|normal_operation_cgo-cpu-bound,high_load_cgo-cpu-bound|normal_operation_cpu-bound-x-client-ip-enabled,high_load_cpu-bound-x-client-ip-enabled PARALLELIZE: "true" go120-only-trace: @@ -120,7 +120,7 @@ go120-only-trace: ENABLE_PROFILING: "false" ENABLE_APPSEC: "false" DD_PROFILING_EXECUTION_TRACE_ENABLED: "false" - GO_VERSION: "1.20.14" + GO_VERSION: "1.21.13" LOAD_TESTS: normal_operation_io-bound,high_load_io-bound|normal_operation_cpu-bound,high_load_cpu-bound|normal_operation_cgo-cpu-bound,high_load_cgo-cpu-bound|normal_operation_cpu-bound-x-client-ip-enabled,high_load_cpu-bound-x-client-ip-enabled PARALLELIZE: "true" go120-only-profile: @@ -131,7 +131,7 @@ go120-only-profile: ENABLE_PROFILING: "true" ENABLE_APPSEC: "false" DD_PROFILING_EXECUTION_TRACE_ENABLED: "false" - GO_VERSION: "1.20.14" + GO_VERSION: "1.21.13" LOAD_TESTS: normal_operation_io-bound,high_load_io-bound|normal_operation_cpu-bound,high_load_cpu-bound|normal_operation_cgo-cpu-bound,high_load_cgo-cpu-bound|normal_operation_cpu-bound-x-client-ip-enabled,high_load_cpu-bound-x-client-ip-enabled PARALLELIZE: "true" go120-profile-trace: @@ -142,7 +142,7 @@ go120-profile-trace: ENABLE_PROFILING: "true" ENABLE_APPSEC: "false" DD_PROFILING_EXECUTION_TRACE_ENABLED: "false" - GO_VERSION: "1.20.14" + GO_VERSION: "1.21.13" LOAD_TESTS: normal_operation_io-bound,high_load_io-bound|normal_operation_cpu-bound,high_load_cpu-bound|normal_operation_cgo-cpu-bound,high_load_cgo-cpu-bound|normal_operation_cpu-bound-x-client-ip-enabled,high_load_cpu-bound-x-client-ip-enabled PARALLELIZE: "true" go120-trace-asm: @@ -153,7 +153,7 @@ go120-trace-asm: ENABLE_PROFILING: "false" ENABLE_APPSEC: "true" DD_PROFILING_EXECUTION_TRACE_ENABLED: "false" - GO_VERSION: "1.20.14" + GO_VERSION: "1.21.13" LOAD_TESTS: normal_operation_io-bound,high_load_io-bound|normal_operation_cpu-bound,high_load_cpu-bound|normal_operation_cgo-cpu-bound,high_load_cgo-cpu-bound|normal_operation_cpu-bound-x-client-ip-enabled,high_load_cpu-bound-x-client-ip-enabled PARALLELIZE: "true" go120-profile-trace-asm: @@ -164,6 +164,6 @@ go120-profile-trace-asm: ENABLE_PROFILING: "true" ENABLE_APPSEC: "true" DD_PROFILING_EXECUTION_TRACE_ENABLED: "false" - GO_VERSION: "1.20.14" + GO_VERSION: "1.21.13" LOAD_TESTS: normal_operation_io-bound,high_load_io-bound|normal_operation_cpu-bound,high_load_cpu-bound|normal_operation_cgo-cpu-bound,high_load_cgo-cpu-bound|normal_operation_cpu-bound-x-client-ip-enabled,high_load_cpu-bound-x-client-ip-enabled PARALLELIZE: "true" diff --git a/pinddtrace.go b/pinddtrace.go index a50d0073e8..44a736750a 100644 --- a/pinddtrace.go +++ b/pinddtrace.go @@ -127,8 +127,8 @@ func modTidy(goVersion string) error { func main() { p := pinning{} p.loadHeadCommit() - p.pin("internal/apps/go.mod", "1.21.10") - p.pin("internal/**/**/go.mod", "1.20.14") - p.pin("v2/contrib/**/**/go.mod", "1.20.14") - p.pin("v2/contrib/**/**/**/go.mod", "1.20.14") + p.pin("internal/apps/go.mod", "1.21.13") + p.pin("internal/**/**/go.mod", "1.21.13") + p.pin("contrib/**/**/go.mod", "1.21.13") + p.pin("contrib/**/**/**/go.mod", "1.21.13") }