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

[9.0](backport #5309) feat: bump go to 1.23.6 #6931

Merged
merged 1 commit into from
Feb 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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"
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 @@ -39,7 +39,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 @@ -118,10 +118,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 @@ -135,19 +131,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