Skip to content

Commit 9d78a18

Browse files
Igor Drozdovashmckenzie
authored andcommitted
Merge branch '779-add-support-for-go-1-23-for-ci-jobs' into 'main'
Resolve "Add support for Go 1.23" Closes #779 See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/1128 Merged-by: Igor Drozdov <[email protected]> Approved-by: Igor Drozdov <[email protected]> Reviewed-by: Igor Drozdov <[email protected]> Reviewed-by: Ash McKenzie <[email protected]> Co-authored-by: Ash McKenzie <[email protected]>
2 parents 1eeecdf + 82d6f64 commit 9d78a18

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ variables:
2525
CI_DEBUG_SERVICES: 'true'
2626
RUST_VERSION: "rust-1.73"
2727
UBI_VERSION: "8.6"
28-
IMAGE_TAG: "rubygems-3.4-git-2.36-exiftool-12.60"
28+
IMAGE_TAG: "rubygems-3.4-git-2.45-exiftool-12.60"
2929
GITLAB_ADVANCED_SAST_ENABLED: 'true'
3030

3131
workflow:
@@ -94,7 +94,7 @@ default:
9494
.go-matrix-job:
9595
parallel:
9696
matrix:
97-
- GO_VERSION: ["golang-1.21", "golang-1.22"]
97+
- GO_VERSION: ["golang-1.22", "golang-1.23"]
9898

9999
################################################################################
100100
# Prepare jobs

cmd/gitlab-shell/command/command.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func NewWithUsername(gitlabUsername string, env sshenv.Env, config *config.Confi
7171
return nil, err
7272
}
7373

74-
// When 1.21+ only Golang is supported, it can be refactored by using slices.Contains
74+
// FIXME: When 1.21+ only Golang is supported, it can be refactored by using slices.Contains
7575
if env.NamespacePath != "" {
7676
exists := false
7777
for _, gitCmd := range commandargs.GitCommands {

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module gitlab.com/gitlab-org/gitlab-shell/v14
22

3-
go 1.21
3+
go 1.22
44

5-
toolchain go1.21.9
5+
toolchain go1.22.6
66

77
require (
88
github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20240809134258-2cab0ea18f7e

0 commit comments

Comments
 (0)