diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0371d966f..cecafa139 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -336,13 +336,6 @@ jobs: ':!LETRO_VERSION' ':!FORK_DIVERGENCE.md' ':!UPSTREAM_VERSION' \ > fork-changes.diff - - name: Login to GitHub Container Registry - uses: docker/login-action@v4.1.0 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Install Trivy run: | curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin @@ -351,24 +344,9 @@ jobs: run: | trivy fs \ --format cyclonedx \ - --output sbom-repo.json \ + --output sbom.json \ . - - - name: Pull the Docker image - env: - IMAGE_DIGEST: ${{ fromJSON(needs.build-image.outputs.metadata).regular.digest }} - run: | - docker pull "${{ env.IMAGE }}@${IMAGE_DIGEST}" - - - name: Generate image SBOM with Trivy - env: - IMAGE_DIGEST: ${{ fromJSON(needs.build-image.outputs.metadata).regular.digest }} - run: | - trivy image \ - --format cyclonedx \ - --output sbom-image.json \ - "${{ env.IMAGE }}@${IMAGE_DIGEST}" - + - name: Prepare a release uses: softprops/action-gh-release@v2.6.1 with: @@ -404,8 +382,7 @@ jobs: files: | fork-changes.diff FORK_DIVERGENCE.md - sbom-repo.json - sbom-image.json + sbom.json unstable: name: Update the unstable release