forked from argoproj/argo-cd
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/argoproj/argo-cd into fea…
…t/cli-support-out-of-sync-only Signed-off-by: pashakostohrys <[email protected]> # Conflicts: # go.mod
- Loading branch information
Showing
213 changed files
with
22,636 additions
and
12,352 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -77,7 +77,7 @@ jobs: | |
fi | ||
- name: Setup Golang | ||
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.0 | ||
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.0.0 | ||
with: | ||
go-version: ${{ env.GOLANG_VERSION }} | ||
|
||
|
@@ -127,13 +127,14 @@ jobs: | |
upload-assets: true | ||
|
||
generate-sbom: | ||
name: Create Sbom and sign assets | ||
name: Create SBOM and generate hash | ||
needs: | ||
- argocd-image | ||
- goreleaser | ||
permissions: | ||
contents: write # Needed for release uploads | ||
id-token: write # Needed for signing Sbom | ||
outputs: | ||
hashes: ${{ steps.sbom-hash.outputs.hashes}} | ||
if: github.repository == 'argoproj/argo-cd' | ||
runs-on: ubuntu-22.04 | ||
steps: | ||
|
@@ -144,15 +145,10 @@ jobs: | |
token: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
- name: Setup Golang | ||
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1 | ||
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 | ||
with: | ||
go-version: ${{ env.GOLANG_VERSION }} | ||
|
||
- name: Install cosign | ||
uses: sigstore/cosign-installer@6e04d228eb30da1757ee4e1dd75a0ec73a653e06 # v3.1.1 | ||
with: | ||
cosign-release: 'v2.0.0' | ||
|
||
- name: Generate SBOM (spdx) | ||
id: spdx-builder | ||
env: | ||
|
@@ -182,23 +178,38 @@ jobs: | |
fi | ||
cd /tmp && tar -zcf sbom.tar.gz *.spdx | ||
- name: Sign SBOM | ||
- name: Generate SBOM hash | ||
shell: bash | ||
id: sbom-hash | ||
run: | | ||
cosign sign-blob \ | ||
--output-certificate=/tmp/sbom.tar.gz.pem \ | ||
--output-signature=/tmp/sbom.tar.gz.sig \ | ||
-y \ | ||
/tmp/sbom.tar.gz | ||
- name: Upload SBOM and signature assets | ||
# sha256sum generates sha256 hash for sbom. | ||
# base64 -w0 encodes to base64 and outputs on a single line. | ||
# sha256sum /tmp/sbom.tar.gz ... | base64 -w0 | ||
echo "hashes=$(sha256sum /tmp/sbom.tar.gz | base64 -w0)" >> "$GITHUB_OUTPUT" | ||
- name: Upload SBOM | ||
uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v0.1.15 | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
with: | ||
files: | | ||
/tmp/sbom.tar.* | ||
/tmp/sbom.tar.gz | ||
sbom-provenance: | ||
needs: [generate-sbom] | ||
permissions: | ||
actions: read # for detecting the Github Actions environment | ||
id-token: write # Needed for provenance signing and ID | ||
contents: write # Needed for release uploads | ||
if: github.repository == 'argoproj/argo-cd' | ||
# Must be refernced by a tag. https://github.com/slsa-framework/slsa-github-generator/blob/main/internal/builders/container/README.md#referencing-the-slsa-generator | ||
uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected] | ||
with: | ||
base64-subjects: "${{ needs.generate-sbom.outputs.hashes }}" | ||
provenance-name: "argocd-sbom.intoto.jsonl" | ||
upload-assets: true | ||
|
||
post-release: | ||
needs: | ||
- argocd-image | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.