From 0b042217485c59ca4b48473139b538b6a4b8d375 Mon Sep 17 00:00:00 2001 From: Javier Marcos <1271349+javuto@users.noreply.github.com> Date: Thu, 29 May 2025 12:48:04 +0200 Subject: [PATCH] Using golang 1.24.3 --- .env.example | 2 +- .github/actions/build/binaries/action.yml | 2 +- .github/actions/test/binaries/action.yml | 2 +- .github/workflows/build_and_test_main_merge.yml | 2 +- .github/workflows/build_and_test_pr.yml | 2 +- .github/workflows/create_tagged_releases.yml | 2 +- .github/workflows/golangci-lint.yml | 2 +- deploy/docker/dockerfiles/Dockerfile-dev-admin | 2 +- deploy/docker/dockerfiles/Dockerfile-dev-api | 2 +- deploy/docker/dockerfiles/Dockerfile-dev-cli | 2 +- deploy/docker/dockerfiles/Dockerfile-dev-tls | 2 +- deploy/lib.sh | 4 ++-- go.mod | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.env.example b/.env.example index c02d4801..d5747333 100644 --- a/.env.example +++ b/.env.example @@ -10,5 +10,5 @@ JWT_SECRET=0000000000000000000000000000000000000000000000000000000000000000 SESSION_KEY=sessionkey OSCTRL_USER=admin OSCTRL_PASS=Changeme123! -GOLANG_VERSION=1.24.2 +GOLANG_VERSION=1.24.3 OSCTRL_TLS_LOGGER=db diff --git a/.github/actions/build/binaries/action.yml b/.github/actions/build/binaries/action.yml index 269883c6..1052b207 100644 --- a/.github/actions/build/binaries/action.yml +++ b/.github/actions/build/binaries/action.yml @@ -19,7 +19,7 @@ inputs: golang_version: required: false description: Define the version of golang to compile with - default: 1.24.2 + default: 1.24.3 runs: using: "composite" diff --git a/.github/actions/test/binaries/action.yml b/.github/actions/test/binaries/action.yml index 2062915c..31fabd08 100644 --- a/.github/actions/test/binaries/action.yml +++ b/.github/actions/test/binaries/action.yml @@ -19,7 +19,7 @@ inputs: golang_version: required: false description: Define the version of golang to compile with - default: 1.24.2 + default: 1.24.3 runs: using: "composite" diff --git a/.github/workflows/build_and_test_main_merge.yml b/.github/workflows/build_and_test_main_merge.yml index b989a137..a4c27a29 100644 --- a/.github/workflows/build_and_test_main_merge.yml +++ b/.github/workflows/build_and_test_main_merge.yml @@ -9,7 +9,7 @@ permissions: contents: read env: - GOLANG_VERSION: 1.24.2 + GOLANG_VERSION: 1.24.3 OSQUERY_VERSION: 5.16.0 jobs: diff --git a/.github/workflows/build_and_test_pr.yml b/.github/workflows/build_and_test_pr.yml index c427e98c..ae2f1655 100644 --- a/.github/workflows/build_and_test_pr.yml +++ b/.github/workflows/build_and_test_pr.yml @@ -5,7 +5,7 @@ permissions: on: [push, pull_request] env: - GOLANG_VERSION: 1.24.2 + GOLANG_VERSION: 1.24.3 OSQUERY_VERSION: 5.16.0 jobs: diff --git a/.github/workflows/create_tagged_releases.yml b/.github/workflows/create_tagged_releases.yml index 51b0e3d6..45949ab4 100644 --- a/.github/workflows/create_tagged_releases.yml +++ b/.github/workflows/create_tagged_releases.yml @@ -10,7 +10,7 @@ permissions: contents: read env: - GOLANG_VERSION: 1.24.2 + GOLANG_VERSION: 1.24.3 OSQUERY_VERSION: 5.16.0 jobs: diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 9fcd7034..0e24ea13 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -14,7 +14,7 @@ permissions: contents: read env: - GOLANG_VERSION: 1.24.2 + GOLANG_VERSION: 1.24.3 jobs: golangci: diff --git a/deploy/docker/dockerfiles/Dockerfile-dev-admin b/deploy/docker/dockerfiles/Dockerfile-dev-admin index 438de6da..80b69103 100644 --- a/deploy/docker/dockerfiles/Dockerfile-dev-admin +++ b/deploy/docker/dockerfiles/Dockerfile-dev-admin @@ -1,5 +1,5 @@ ######################################## osctrl-dev-base ######################################## -ARG GOLANG_VERSION=${GOLANG_VERSION:-1.24.2} +ARG GOLANG_VERSION=${GOLANG_VERSION:-1.24.3} FROM golang:${GOLANG_VERSION} AS osctrl-admin-dev WORKDIR /usr/src/app diff --git a/deploy/docker/dockerfiles/Dockerfile-dev-api b/deploy/docker/dockerfiles/Dockerfile-dev-api index 33749a6a..a2e7ef49 100644 --- a/deploy/docker/dockerfiles/Dockerfile-dev-api +++ b/deploy/docker/dockerfiles/Dockerfile-dev-api @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=${GOLANG_VERSION:-1.24.2} +ARG GOLANG_VERSION=${GOLANG_VERSION:-1.24.3} FROM golang:${GOLANG_VERSION} AS osctrl-api-dev WORKDIR /usr/src/app diff --git a/deploy/docker/dockerfiles/Dockerfile-dev-cli b/deploy/docker/dockerfiles/Dockerfile-dev-cli index 7b955957..b5c3bcc1 100644 --- a/deploy/docker/dockerfiles/Dockerfile-dev-cli +++ b/deploy/docker/dockerfiles/Dockerfile-dev-cli @@ -1,5 +1,5 @@ #################################################### osctrl-cli-dev #################################################### -ARG GOLANG_VERSION=${GOLANG_VERSION:-1.24.2} +ARG GOLANG_VERSION=${GOLANG_VERSION:-1.24.3} FROM golang:${GOLANG_VERSION} AS osctrl-cli-dev WORKDIR /usr/src/app diff --git a/deploy/docker/dockerfiles/Dockerfile-dev-tls b/deploy/docker/dockerfiles/Dockerfile-dev-tls index e4e11f94..1f1257e2 100644 --- a/deploy/docker/dockerfiles/Dockerfile-dev-tls +++ b/deploy/docker/dockerfiles/Dockerfile-dev-tls @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=${GOLANG_VERSION:-1.24.2} +ARG GOLANG_VERSION=${GOLANG_VERSION:-1.24.3} FROM golang:${GOLANG_VERSION} AS osctrl-tls-dev WORKDIR /usr/src/app diff --git a/deploy/lib.sh b/deploy/lib.sh index 1da2834a..31804690 100644 --- a/deploy/lib.sh +++ b/deploy/lib.sh @@ -405,9 +405,9 @@ function set_motd_centos() { echo "$__centosmotd" | sudo tee -a /etc/profile } -# Install go 1.24.2 from tgz +# Install go 1.24.3 from tgz function install_go_24() { - local __version="1.24.2" + local __version="1.24.3" local __arch="$(uname -i)" if [[ "$__arch" == "aarch64" ]]; then __arch="arm64" diff --git a/go.mod b/go.mod index d15f08fb..01c11ff2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/jmpsec/osctrl -go 1.24.2 +go 1.24.3 require ( github.com/DATA-DOG/go-sqlmock v1.5.2