Skip to content

Commit

Permalink
Merge pull request #486 from jmpsec/native-mux-admin-go
Browse files Browse the repository at this point in the history
Bump golang version to 1.23.0
  • Loading branch information
javuto authored Aug 19, 2024
2 parents 136dd01 + cfc26fd commit 440bc2a
Show file tree
Hide file tree
Showing 27 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ JWT_SECRET=0000000000000000000000000000000000000000000000000000000000000000
SESSION_KEY=sessionkey
OSCTRL_USER=admin
OSCTRL_PASS=Changeme123!
GOLANG_VERSION=1.21.3
GOLANG_VERSION=1.23.0
2 changes: 1 addition & 1 deletion .github/actions/build/binaries/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ inputs:
golang_version:
required: false
description: Define the version of golang to compile with
default: 1.21.3
default: 1.23.0

runs:
using: "composite"
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/test/binaries/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ inputs:
golang_version:
required: false
description: Define the version of golang to compile with
default: 1.21.3
default: 1.23.0

runs:
using: "composite"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test_main_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- main

env:
GOLANG_VERSION: 1.21.3
GOLANG_VERSION: 1.23.0
OSQUERY_VERSION: 5.12.1

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build and test PRs pushed to osctrl
on: [push, pull_request]

env:
GOLANG_VERSION: 1.21.3
GOLANG_VERSION: 1.23.0
OSQUERY_VERSION: 5.12.1

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_tagged_releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
tags: [ 'v*.*.*' ]

env:
GOLANG_VERSION: 1.21.3
GOLANG_VERSION: 1.23.0
OSQUERY_VERSION: 5.12.1

jobs:
Expand Down
2 changes: 1 addition & 1 deletion admin/handlers/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/admin/handlers

go 1.21
go 1.23

replace github.com/jmpsec/osctrl/admin/sessions => ../../admin/sessions

Expand Down
2 changes: 1 addition & 1 deletion admin/sessions/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/admin/sessions

go 1.21
go 1.23

replace github.com/jmpsec/osctrl/environments => ../../environments

Expand Down
2 changes: 1 addition & 1 deletion api/handlers/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/jmpsec/osctrl/api/handlers

go 1.21
go 1.23
2 changes: 1 addition & 1 deletion backend/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/backend

go 1.21
go 1.23

require (
github.com/spf13/viper v1.19.0
Expand Down
2 changes: 1 addition & 1 deletion cache/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/cache

go 1.21
go 1.23

replace github.com/jmpsec/osctrl/nodes => ../nodes

Expand Down
2 changes: 1 addition & 1 deletion carves/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/carves

go 1.21
go 1.23

replace github.com/jmpsec/osctrl/nodes => ../nodes

Expand Down
6 changes: 3 additions & 3 deletions deploy/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -397,9 +397,9 @@ function set_motd_centos() {
echo "$__centosmotd" | sudo tee -a /etc/profile
}

# Install go 1.21.3 from tgz
function install_go_21() {
local __version="1.21.3"
# Install go 1.23.0 from tgz
function install_go_23() {
local __version="1.23.0"
local __arch="$(uname -i)"
if [[ "$__arch" == "aarch64" ]]; then
__arch="arm64"
Expand Down
2 changes: 1 addition & 1 deletion deploy/provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ package rsync
# Golang
# package golang-go
if ! [ -x "$(command -v go)" ]; then
install_go_21
install_go_23
fi

# Upgrade service
Expand Down
2 changes: 1 addition & 1 deletion environments/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/environments

go 1.21
go 1.23

replace github.com/jmpsec/osctrl/nodes => ../nodes

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module osctrl

go 1.21
go 1.23

replace github.com/jmpsec/osctrl/admin/auth => ./admin/auth

Expand Down
2 changes: 1 addition & 1 deletion logging/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/logging

go 1.21
go 1.23

replace github.com/jmpsec/osctrl/backend => ../backend

Expand Down
2 changes: 1 addition & 1 deletion metrics/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/metrics

go 1.21
go 1.23

replace github.com/jmpsec/osctrl/types => ../types

Expand Down
2 changes: 1 addition & 1 deletion nodes/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/nodes

go 1.21
go 1.23

require gorm.io/gorm v1.25.11

Expand Down
2 changes: 1 addition & 1 deletion queries/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/queries

go 1.21
go 1.23

replace github.com/jmpsec/osctrl/nodes => ../nodes

Expand Down
2 changes: 1 addition & 1 deletion settings/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/settings

go 1.21
go 1.23

replace github.com/jmpsec/osctrl/nodes => ../nodes

Expand Down
2 changes: 1 addition & 1 deletion tags/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/tags

go 1.21
go 1.23

replace github.com/jmpsec/osctrl/nodes => ../nodes

Expand Down
2 changes: 1 addition & 1 deletion tls/handlers/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/tls/handlers

go 1.21
go 1.23

replace github.com/jmpsec/osctrl/backend => ../../backend

Expand Down
2 changes: 1 addition & 1 deletion types/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/types

go 1.21
go 1.23

replace github.com/jmpsec/osctrl/nodes => ../nodes

Expand Down
2 changes: 1 addition & 1 deletion users/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/users

go 1.21
go 1.23

replace github.com/jmpsec/osctrl/nodes => ../nodes

Expand Down
2 changes: 1 addition & 1 deletion utils/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/utils

go 1.21
go 1.23

require (
github.com/google/uuid v1.6.0
Expand Down
2 changes: 1 addition & 1 deletion version/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/version

go 1.21
go 1.23

require github.com/stretchr/testify v1.9.0

Expand Down

0 comments on commit 440bc2a

Please sign in to comment.