Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/lint-test-build-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,14 @@ jobs:
publish:
if: github.event_name != 'pull_request'
needs: test
uses: libops/.github/.github/workflows/build-push.yaml@d5a29840172a53729c5999832534de65b7ba9587
uses: libops/.github/.github/workflows/build-push.yaml@8e27d95846671a9e319f1900e86a488a1d4f39b3
with:
ref: ${{ github.sha }}
expected-main-sha: ${{ github.ref == 'refs/heads/main' && github.sha || '' }}
additional-gar-registry: us-docker.pkg.dev/libops-images/public
scan: true
sign: true
certificate-identity: https://github.com/libops/.github/.github/workflows/build-push.yaml@d5a29840172a53729c5999832534de65b7ba9587
certificate-identity: https://github.com/libops/.github/.github/workflows/build-push.yaml@8e27d95846671a9e319f1900e86a488a1d4f39b3
permissions:
contents: read
id-token: write
Expand Down
9 changes: 6 additions & 3 deletions ci/publication_contract_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ import (
"testing"
)

const sharedWorkflowSHA = "d5a29840172a53729c5999832534de65b7ba9587"
const (
sharedPublisherSHA = "8e27d95846671a9e319f1900e86a488a1d4f39b3"
sharedWorkflowSHA = "d5a29840172a53729c5999832534de65b7ba9587"
)

func repositoryRoot(t *testing.T) string {
t.Helper()
Expand All @@ -31,7 +34,7 @@ func readFile(t *testing.T, path ...string) string {
func TestPublicationUsesSharedGHCRAndGARContract(t *testing.T) {
workflow := readFile(t, ".github", "workflows", "lint-test-build-push.yml")
for _, required := range []string{
"libops/.github/.github/workflows/build-push.yaml@" + sharedWorkflowSHA,
"libops/.github/.github/workflows/build-push.yaml@" + sharedPublisherSHA,
"libops/.github/.github/workflows/pr-status.yaml@" + sharedWorkflowSHA,
"\n build-push:\n",
"image-check:",
Expand All @@ -48,7 +51,7 @@ func TestPublicationUsesSharedGHCRAndGARContract(t *testing.T) {
"expected-main-sha:",
"scan: true",
"sign: true",
"certificate-identity: https://github.com/libops/.github/.github/workflows/build-push.yaml@" + sharedWorkflowSHA,
"certificate-identity: https://github.com/libops/.github/.github/workflows/build-push.yaml@" + sharedPublisherSHA,
"GCLOUD_OIDC_POOL: ${{ secrets.GCLOUD_OIDC_POOL }}",
"GSA: ${{ secrets.GSA }}",
} {
Expand Down
Loading