Skip to content

Commit

Permalink
build: Revert specifics for Go 1.21.4, build using Go 1.21.5 (#9264)
Browse files Browse the repository at this point in the history
This reverts commit e477777.

In principle, we could have stayed with `~1.21.1`, but `check-latest:
true` apparently checks some cache/manifest/something that is only
periodically refreshed and isn't aware of 1.21.5 yet. So update the
constraints to force an upgrade.

Also the infrastructure images weren't actually using the constraint
since there was no `setup-go` action...
  • Loading branch information
calmh committed Dec 6, 2023
1 parent c1ec9a8 commit 8064957
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 19 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/build-infra-dockers.yaml
Expand Up @@ -6,7 +6,7 @@ on:
- infrastructure

env:
GO_VERSION: "~1.21.1"
GO_VERSION: "~1.21.5"
CGO_ENABLED: "0"
BUILD_USER: docker
BUILD_HOST: github.syncthing.net
Expand All @@ -28,6 +28,11 @@ jobs:
with:
fetch-depth: 0

- uses: actions/setup-go@v4
with:
go-version: ${{ env.GO_VERSION }}
check-latest: true

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
Expand Down
21 changes: 3 additions & 18 deletions .github/workflows/build-syncthing.yaml
Expand Up @@ -12,7 +12,7 @@ env:
# The go version to use for builds. We set check-latest to true when
# installing, so we get the latest patch version that matches the
# expression.
GO_VERSION: "~1.21.1"
GO_VERSION: "~1.21.5"

# Optimize compatibility on the slow archictures.
GO386: softfloat
Expand Down Expand Up @@ -48,20 +48,7 @@ jobs:
runner: ["windows-latest", "ubuntu-latest", "macos-latest"]
# The oldest version in this list should match what we have in our go.mod.
# Variables don't seem to be supported here, or we could have done something nice.
go: ["1.20", "1.21"]

# Don't run the Windows tests with Go 1.21.4 or 1.20.11; this can be
# removed when 1.21.5 and 1.20.12 is released.
exclude:
- runner: windows-latest
go: "1.20"
- runner: windows-latest
go: "1.21"
include:
- runner: windows-latest
go: "~1.20.12 || ~1.20.0 <1.20.11"
- runner: windows-latest
go: "~1.21.5 || ~1.21.1 <1.21.4"
go: ["~1.20.12", "~1.21.5"]
runs-on: ${{ matrix.runner }}
steps:
- name: Set git to use LF
Expand Down Expand Up @@ -169,9 +156,7 @@ jobs:

- uses: actions/setup-go@v4
with:
# Temporary version constraint to avoid 1.21.4 which has a bug in
# path handling. This can be removed when 1.21.5 is released.
go-version: "~1.21.5 || ~1.21.1 <1.21.4"
go-version: ${{ env.GO_VERSION }}
cache: false
check-latest: true

Expand Down

0 comments on commit 8064957

Please sign in to comment.