Merge pull request #41 from Conjur-Enterprise/fix-goreleaser

CNJR-5882: Fix goreleaser deprecated flag
cyberark · Dec 18, 2024 · b2c0274 · b2c0274
2 parents 1283941 + c5d6ca3
commit b2c0274
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/bin/build_release b/bin/build_release
@@ -48,6 +48,6 @@ docker run --rm -t \
   --env VERSION="${VERSION}" \
   --volume "${REPO_ROOT}:/secretless-broker" \
   --workdir /secretless-broker \
-  "${GORELEASER_IMAGE}:${GORELEASER_LATEST_TAG}" --rm-dist "$@"
+  "${GORELEASER_IMAGE}:${GORELEASER_LATEST_TAG}" --clean "$@"
 
 echo "Releases built. Archives can be found in dist/goreleaser"
diff --git a/bin/check_golang_security b/bin/check_golang_security
@@ -7,7 +7,7 @@
 set -eo pipefail
 
 current_dir=$("$(dirname "$0")/abspath")
-toplevel_dir="$current_dir/.."
+toplevel_dir="$(cd "$current_dir/.." && pwd)"
 
 # Default values to pass to security_scan
 confidence='medium'
@@ -39,6 +39,7 @@ if [[ ! -v BRANCH_NAME ]]; then
 else
   # Running in Jenkins
   excluded_directories="${toplevel_dir}/test,${toplevel_dir}/third_party/go-mssqldb"
+  echo "Excluding directories: ${excluded_directories}"
   go install github.com/securego/gosec/v2/cmd/gosec@latest
   git config --global --add safe.directory "${WORKSPACE}"
   ./bin/run_gosec -c "${confidence}" -s "${severity}" -b "${current_branch}" -e "${excluded_directories}"