Skip to content

Commit b653ab9

Browse files
szhGitHub Enterprise
authored andcommitted
Merge pull request #42 from Conjur-Enterprise/fix-goreleaser
CNJR-5882: Fix goreleaser config deprecations
2 parents b2c0274 + 41cad9b commit b653ab9

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

.goreleaser.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
version: 2
12
before:
23
hooks:
34
- ./bin/go_mod_tidy # Get dependencies
@@ -156,7 +157,7 @@ brews:
156157
bin.install "secretless-broker"
157158
test: |
158159
system "#{bin}/secretless-broker", "-version"
159-
tap:
160+
repository:
160161
owner: cyberark
161162
name: homebrew-tools
162163
skip_upload: true

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ pipeline {
402402
infrapool.agentPut from: """${WORKSPACE}/pristine-checkout""", to: """$WORKSPACE/"""
403403
infrapool.agentSh 'git submodule update --init --recursive'
404404
// Create release packages without releasing to Github
405-
infrapool.agentSh "./bin/build_release --skip-validate"
405+
infrapool.agentSh "./bin/build_release --skip=validate"
406406
infrapool.agentArchiveArtifacts artifacts: 'dist/goreleaser/'
407407
}
408408
}

bin/build_release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ REPO_ROOT="$(git rev-parse --show-toplevel)"
99
GO_VERSION="v$(grep "^\bgo\b" "${REPO_ROOT}/go.mod" | awk '{print $2}')"
1010

1111
# Determine where VERSION file is based on goreleaser argument
12-
if [[ "$1" == '--skip-validate' ]]; then
12+
if [[ "$1" == '--skip=validate' ]]; then
1313
VERSION=$(<"${REPO_ROOT}/../VERSION")
1414
else
1515
VERSION=$(<"${REPO_ROOT}/VERSION")

bin/check_golang_security

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ else
4040
# Running in Jenkins
4141
excluded_directories="${toplevel_dir}/test,${toplevel_dir}/third_party/go-mssqldb"
4242
echo "Excluding directories: ${excluded_directories}"
43+
# TODO: Somehow this still fails to exclude them.
44+
# Excluding directories: /home/jenkins/agent/workspace/secretless-broker-main-full_main/test,/home/jenkins/agent/workspace/secretless-broker-main-full_main/third_party/go-mssqldb
45+
# later...
46+
# Import directory: /home/jenkins/agent/workspace/secretless-broker-main-full_main/secretless-broker-main-full_main/third_party/go-mssqldb/examples/tsql
4347
go install github.com/securego/gosec/v2/cmd/gosec@latest
4448
git config --global --add safe.directory "${WORKSPACE}"
4549
./bin/run_gosec -c "${confidence}" -s "${severity}" -b "${current_branch}" -e "${excluded_directories}"

0 commit comments

Comments
 (0)