Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: bump go to 1.23.6 #5309

Merged
merged 26 commits into from
Feb 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
695a1a1
feat: bump to go 1.23.0
kruskall Aug 16, 2024
55b71be
changelog: update PR url
kruskall Aug 18, 2024
dafa645
feat: bump golangci-lint for go 1.23 support
kruskall Aug 18, 2024
0477e08
feat: bump to go 1.23.1
kruskall Sep 7, 2024
5fe042c
feat: also update .go-version
kruskall Sep 7, 2024
d7fa221
Revert "feat: also update .go-version"
kruskall Sep 7, 2024
460d1bf
Revert "feat: bump to go 1.23.1"
kruskall Sep 7, 2024
85d34f0
feat: bump go to 1.23.1
kruskall Sep 21, 2024
145ce2b
feat: bump to go 1.23.2
kruskall Oct 3, 2024
867217f
feat: bump to go 1.23.3
kruskall Nov 8, 2024
ae0c790
Update .tool-versions
kruskall Nov 10, 2024
a56804b
feat: update to 1.23.4
kruskall Dec 5, 2024
d8e5cc5
Update .golangci.yml
kruskall Dec 7, 2024
34d819f
Merge branch 'main' into bump/go1.23
kruskall Dec 24, 2024
87de71a
Merge branch 'main' into bump/go1.23
kruskall Dec 25, 2024
83c2fff
lint: run verbose mode
kruskall Dec 25, 2024
a54096f
Merge branch 'main' into bump/go1.23
jlind23 Jan 31, 2025
fd1a354
Merge branch 'main' into bump/go1.23
kruskall Feb 7, 2025
50d8a24
Update pipeline.yml
kruskall Feb 7, 2025
cf51ef5
Update .go-version
kruskall Feb 7, 2025
df133e5
Update .tool-versions
kruskall Feb 7, 2025
630ae11
Update runner_test.go
kruskall Feb 7, 2025
2b1ecc5
Merge branch 'main' into bump/go1.23
kruskall Feb 8, 2025
01d0cd3
Update gotest.go
kruskall Feb 13, 2025
d9b5558
Merge branch 'main' into bump/go1.23
v1v Feb 13, 2025
55126a0
Merge branch 'main' into bump/go1.23
kruskall Feb 13, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ steps:
artifact_paths:
- "build/TEST-go-unit.cov"
agents:
image: "golang:1.22.6"
image: "golang:1.23.6"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've just created #6893

depends_on:
- unit-tests
- extended-windows
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bump-agent-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21
go-version-file: 'go.mod'

- name: Set git config
run: |
Expand Down
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.22.12
1.23.6
12 changes: 0 additions & 12 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,6 @@ linters-settings:
- github.com/fsnotify/fsnotify
- github.com/openshift/api

gosimple:
# Select the Go version to target. The default is '1.13'.
go: "1.22.12"

nolintlint:
# Enable to ensure that nolint directives are all used. Default is true.
allow-unused: false
Expand All @@ -145,19 +141,11 @@ linters-settings:
require-specific: false

staticcheck:
# Select the Go version to target. The default is '1.13'.
go: "1.22.12"
checks: ["all"]

stylecheck:
# Select the Go version to target. The default is '1.13'.
go: "1.22.12"
checks: ["all"]

unused:
# Select the Go version to target. The default is '1.13'.
go: "1.22.12"

gosec:
excludes:
- G306 # Expect WriteFile permissions to be 0600 or less
Expand Down
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
mage 1.14.0
golang 1.22.9
terraform 1.9.3
golang 1.23.6
terraform 1.9.3
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.22.12
ARG GO_VERSION=1.23.6
FROM circleci/golang:${GO_VERSION}


Expand All @@ -7,7 +7,6 @@ ARG TEST_RESULTS=/tmp/test-results
RUN mkdir -p ${TEST_RESULTS} && mkdir -p ./code
RUN go get github.com/magefile/mage

ENV GO111MODULE=on
WORKDIR ./code
#COPY --chown=circleci:circleci . .
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.skaffold
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.22.12
ARG GO_VERSION=1.23.6
ARG crossbuild_image="docker.elastic.co/beats-dev/golang-crossbuild"
ARG AGENT_VERSION=8.9.0-SNAPSHOT
ARG AGENT_IMAGE="docker.elastic.co/beats/elastic-agent"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ check:
## check-go: download and run the go linter.
.PHONY: check-go
check-go: ## - Run golangci-lint
@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.55.2
@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.60.1
@./bin/golangci-lint run -v

## check-no-changes : Check there is no local changes.
Expand Down
32 changes: 32 additions & 0 deletions changelog/fragments/1723829102-Upgrade-to-Go-1.23.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Kind can be one of:
# - breaking-change: a change to previously-documented behavior
# - deprecation: functionality that is being removed in a later release
# - bug-fix: fixes a problem in a previous version
# - enhancement: extends functionality but does not break or fix existing behavior
# - feature: new functionality
# - known-issue: problems that we are aware of in a given version
# - security: impacts on the security of a product or a user’s deployment.
# - upgrade: important information for someone upgrading from a prior version
# - other: does not fit into any of the other categories
kind: feature

# Change summary; a 80ish characters long description of the change.
summary: Upgrade-to-Go-1.23.0

# Long description; in case the summary is not enough to describe the change
# this field accommodate a description without length limits.
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
#description:

# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
component: "elastic-agent"

# PR URL; optional; the PR number that added the changeset.
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
# Please provide it if you are adding a fragment for a different PR.
pr: https://github.com/elastic/elastic-agent/pull/5309

# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
# If not present is automatically filled by the tooling with the issue linked to the PR number.
#issue: https://github.com/owner/repo/1234
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/elastic/elastic-agent

go 1.22.12
go 1.23.6

require (
github.com/Jeffail/gabs/v2 v2.6.0
Expand Down
2 changes: 1 addition & 1 deletion pkg/testing/runner/runner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func TestNewRunner_Clean(t *testing.T) {
AgentVersion: "8.10.0",
StackVersion: "8.10.0-SNAPSHOT",
BuildDir: filepath.Join(tmpdir, "build"),
GOVersion: "1.20.7",
GOVersion: "1.23.6",
RepoDir: filepath.Join(tmpdir, "repo"),
StateDir: stateDir,
ExtraEnv: nil,
Expand Down
2 changes: 1 addition & 1 deletion version/docs/version.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// FIXME: once elastic.co docs have been switched over to use `main`, remove
// the `doc-site-branch` line below as well as any references to it in the code.
:doc-site-branch: master
:go-version: 1.22.12
:go-version: 1.23.6
:release-state: unreleased
:python: 3.7
:docker: 1.12
Expand Down
Loading