Skip to content

OCPBUGS-126705: fix: set LC_ALL=C.UTF-8 for crypto scanner and distinguish skipped scans #7402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fracappa wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −8
Open

OCPBUGS-126705: fix: set LC_ALL=C.UTF-8 for crypto scanner and distinguish skipped scans #7402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions scripts/auto-rebase/crypto_scan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ cp -a "${REPOROOT}/etcd/cmd" "${SCAN_DIR}/etcd-cmd"
cp -a "${REPOROOT}/etcd/vendor" "${SCAN_DIR}/etcd-deps"

if ! podman run --rm \
-e LC_ALL=C.UTF-8 \
-v "${SCAN_DIR}:/workspace:z" \
"${SCANNER_IMAGE}" \
/workspace > "${CBOM_OUTPUT}"; then
Expand Down
17 changes: 9 additions & 8 deletions scripts/auto-rebase/rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1341,14 +1341,15 @@ rebase_to() {
# Generate CBOM (Cryptographic Bill of Materials)
if [[ "${SKIP_CRYPTOSCAN:-}" != "true" ]]; then
title "## Generating CBOM (Cryptographic Bill of Materials)"
./scripts/auto-rebase/crypto_scan.sh
if [[ -n "$(git status -s cbom-microshift.json sbom-microshift-crypto.spdx.json)" ]]; then
echo "Updating CBOM"
git add cbom-microshift.json sbom-microshift-crypto.spdx.json
git commit -m "update cbom"
else
echo "No changes to CBOM."
fi
if ./scripts/auto-rebase/crypto_scan.sh; then
Comment thread
coderabbitai[bot] marked this conversation as resolved.
if [[ -n "$(git status -s cbom-microshift.json sbom-microshift-crypto.spdx.json)" ]]; then
echo "Updating CBOM"
git add cbom-microshift.json sbom-microshift-crypto.spdx.json
git commit -m "update cbom"
else
echo "No changes to CBOM."
fi
fi
fi

title "# Removing staging directory"
Expand Down