Skip to content
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

Jump to bottom

More SBOM logic improvements #1459

Merged
merged 8 commits into from
Aug 28, 2024
Merged

More SBOM logic improvements #1459

merged 8 commits into from
Aug 28, 2024

Commits on Aug 27, 2024

  1. fix(sbom): ext ref category should use dash not underscore 

    See https://spdx.github.io/spdx-spec/v2.3/package-information/#721-external-reference-field

Signed-off-by: Dan Luhring <dluhring@chainguard.dev>
    @luhring
    luhring committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    b63742c View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. refactor(sbom): pull apart SBOM generation from writing to the APK 

    Signed-off-by: Dan Luhring <dluhring@chainguard.dev>
    @luhring
    luhring committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    21238c3 View commit details
    Browse the repository at this point in the history

  2. add warning comments for git detection 

    Signed-off-by: Dan Luhring <dluhring@chainguard.dev>
    @luhring
    luhring committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    3fb17d6 View commit details
    Browse the repository at this point in the history

  3. rename checkEnvironment function 

    Signed-off-by: Dan Luhring <dluhring@chainguard.dev>
    @luhring
    luhring committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    6ac7e35 View commit details
    Browse the repository at this point in the history

  4. hoist extRefCatPackageManager to package level 

    Signed-off-by: Dan Luhring <dluhring@chainguard.dev>
    @luhring
    luhring committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    7209756 View commit details
    Browse the repository at this point in the history

  5. fix name of generateAPKPackage SBOM function 

    Signed-off-by: Dan Luhring <dluhring@chainguard.dev>
    @luhring
    luhring committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    9f3a18f View commit details
    Browse the repository at this point in the history

  6. cross-reference second implementation of git state detection 

    Signed-off-by: Dan Luhring <dluhring@chainguard.dev>
    @luhring
    luhring committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    c7f9e86 View commit details
    Browse the repository at this point in the history

  7. ci: comment out gdk-pixbuf build for now 

    There appears to be an upstream issue with this package that should not block melange CI: https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/515

Also, it looks like this has happened before, see melange PR chainguard-dev#1143 that was later reverted in PR chainguard-dev#1147.

Signed-off-by: Dan Luhring <dluhring@chainguard.dev>
    @luhring
    luhring committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    c932c79 View commit details
    Browse the repository at this point in the history