From 8c78b47176d98e0349a4d0c3e71de84688497cdc Mon Sep 17 00:00:00 2001 From: Austin Vazquez Date: Tue, 9 Dec 2025 09:25:35 -0600 Subject: [PATCH 1/3] ci: upgrade actions/setup-go from v5 to v6 Signed-off-by: Austin Vazquez --- .github/workflows/ci.yml | 4 ++-- .github/workflows/merge.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85ccf8cc6f8..39e63e8e3bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -199,7 +199,7 @@ jobs: docker model version - name: Set up Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: go-version-file: 'go.mod' check-latest: true @@ -264,7 +264,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Set up Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: go-version-file: 'go.mod' check-latest: true diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index cb1872a9d31..5ffd5b17321 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -33,7 +33,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 + - uses: actions/setup-go@v6 with: go-version-file: go.mod cache: true From 3021787366c52b084b1515b1ece2efe0861aa884 Mon Sep 17 00:00:00 2001 From: Austin Vazquez Date: Tue, 9 Dec 2025 09:32:27 -0600 Subject: [PATCH 2/3] ci: use .go-version file for actions/setup-go Signed-off-by: Austin Vazquez --- .github/workflows/ci.yml | 4 ++-- .github/workflows/merge.yml | 2 +- .go-version | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 .go-version diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39e63e8e3bd..8d8920b2669 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -201,7 +201,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v6 with: - go-version-file: 'go.mod' + go-version-file: '.go-version' check-latest: true cache: true @@ -266,7 +266,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v6 with: - go-version-file: 'go.mod' + go-version-file: '.go-version' check-latest: true - name: Download unit test coverage uses: actions/download-artifact@v4 diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 5ffd5b17321..1a4650e3dd1 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -35,7 +35,7 @@ jobs: - uses: actions/setup-go@v6 with: - go-version-file: go.mod + go-version-file: '.go-version' cache: true check-latest: true diff --git a/.go-version b/.go-version new file mode 100644 index 00000000000..2cd26087ba9 --- /dev/null +++ b/.go-version @@ -0,0 +1 @@ +1.24.11 \ No newline at end of file From 4a44179ba3d13fb28a34eb33287a166177bda0a5 Mon Sep 17 00:00:00 2001 From: Austin Vazquez Date: Wed, 3 Dec 2025 13:07:45 -0600 Subject: [PATCH 3/3] Set Go min version to absolute minimum version required Signed-off-by: Austin Vazquez --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 67d3647b5ee..8d6556eb54a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/docker/compose/v5 -go 1.24.11 +go 1.24.3 require ( github.com/AlecAivazis/survey/v2 v2.3.7