Skip to content

Commit

Permalink
CONJSE-1864: Merge pull request #9 from Conjur-Enterprise/rollback-go…
Browse files Browse the repository at this point in the history
…-version

CONJSE-1864: Temporarily rollback go version to 1.20.14
  • Loading branch information
codihuston authored and GitHub Enterprise committed May 8, 2024
2 parents c3c512a + 43164b2 commit 85899ce
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [0.11.3] - 2024-05-08

### Security
- Rollback to Go 1.20 as a requirement to build conjur-cli-go as FIPS
compliant (CONJSE-1864)

## [0.11.2] - 2024-04-18

### Changed
Expand Down
8 changes: 4 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ pipeline {
REGISTRY_URL = "registry.tld"
}
parallel {
stage('Golang 1.22') {
stage('Golang 1.20') {
steps {
script {
infrapool.agentSh "./bin/test.sh 1.22 $REGISTRY_URL"
infrapool.agentStash name: '1.22-out', includes: 'output/1.22/*.xml'
unstash '1.22-out'
infrapool.agentSh "./bin/test.sh 1.20 $REGISTRY_URL"
infrapool.agentStash name: '1.20-out', includes: 'output/1.20/*.xml'
unstash '1.20-out'
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ services:
CONJUR_AUTHN_API_KEY:
GO_VERSION:

test-1.22:
test-1.20:
build:
context: .
args:
FROM_IMAGE: "golang:1.22"
FROM_IMAGE: "golang:1.20"
ports:
- 8080
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/cyberark/conjur-api-go

// This version has to be the lowest of the versions that we run tests with. Currently
// we test with 1.21 and 1.22 (See Jenkinsfile) so this needs to be 1.21.
go 1.21.8
go 1.20

require (
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d
Expand Down

0 comments on commit 85899ce

Please sign in to comment.