Skip to content

Commit

Permalink
Use a consistent name for sbom files.
Browse files Browse the repository at this point in the history
  • Loading branch information
khushboovashi committed Aug 11, 2023
1 parent 7fcfea2 commit e80d55e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Make.bat
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ REM Main build sequence Ends

:GENERATE_SBOM
ECHO Generating SBOM...
syft "%DISTROOT%\" -o cyclonedx-json > "%DISTROOT%\cyclonedx.json"
syft "%BUILDROOT%\" -o cyclonedx-json > "%BUILDROOT%\sbom.json"

:SIGN_INSTALLER
ECHO Attempting to sign the installer...
Expand Down
2 changes: 1 addition & 1 deletion pkg/debian/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Maintainer: pgAdmin Development Team <[email protected]>
Description: The desktop user interface for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
EOF

# Build the Debian package for the server
# Build the Debian package for the desktop
fakeroot dpkg-deb --build "${DESKTOPROOT}" "${DISTROOT}/${APP_NAME}-desktop_${APP_LONG_VERSION}_${OS_ARCH}.deb"

#
Expand Down
2 changes: 1 addition & 1 deletion pkg/mac/build-functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ _complete_bundle() {

_generate_sbom() {
echo "Generating SBOM..."
syft "${BUNDLE_DIR}/Contents/" -o cyclonedx-json > "${BUNDLE_DIR}/Contents/cyclonedx.json"
syft "${BUNDLE_DIR}/Contents/" -o cyclonedx-json > "${BUNDLE_DIR}/Contents/sbom.json"
}

_codesign_binaries() {
Expand Down

0 comments on commit e80d55e

Please sign in to comment.