Skip to content

Commit ad94661

Browse files
authored
Merge pull request #2630 from ublue-os/main
[pull] stable-f44 from main
2 parents 345e8b2 + 24c1b98 commit ad94661

6 files changed

Lines changed: 16 additions & 14 deletions

File tree

.github/renovate.json5

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,13 @@
6363
"enabled": false
6464
},
6565
{
66+
"matchManagers": ["github-actions"],
6667
"matchDepNames": [
67-
"github/codeql-action/upload-sarif"
68+
"!oras-project/setup-oras",
69+
"!sigstore/cosign-installer",
70+
"!anchore/sbom-action"
6871
],
69-
"extends": ["schedule:weekly"]
72+
"schedule": ["on sunday"]
7073
}
7174
]
7275
}

.github/workflows/reusable-build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ jobs:
9797
# FIXME: Implement retries for stuff like this
9898
- name: Install Cosign
9999
uses: sigstore/cosign-installer@6f9f17788090df1f26f669e9d70d6ae9567deba6 # v4.1.2
100+
# be careful when upgrading major versions
101+
with:
102+
cosign-release: 'v3.1.2'
100103

101104
- name: Install ORAS
102105
uses: oras-project/setup-oras@1d808f7d7f6995cc68b7bf507bfe5c5446e1dc9d # v2.0.1
@@ -444,7 +447,7 @@ jobs:
444447
445448
- name: Attestation
446449
if: inputs.publish
447-
uses: actions/attest@f7c74d28b9d84cb8768d0b8ca14a4bac6ef463e6 # v4.2.0
450+
uses: actions/attest@508db95dd578ae2727ebd6217d5ba78e4fbda05d # v4.2.1
448451
with:
449452
subject-name: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}
450453
subject-digest: ${{ steps.pre-push.outputs.digest }}

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ jobs:
7171
# Upload the results to GitHub's code scanning dashboard (optional).
7272
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@e0647621c2984b5ed2f768cb892365bf2a616ad1 # v4.37.2
74+
uses: github/codeql-action/upload-sarif@f205ea1c3313d32999d8d6a48b4f6530d4437b38 # v4.37.4
7575
with:
7676
sarif_file: results.sarif

Justfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,14 +202,16 @@ build $image=default_image $tag=default_tag $flavor=default_flavor $rechunk="fal
202202
ALL_IMAGES+=("${AKMODS_NVIDIA_OPEN}")
203203
fi
204204
205-
cosign verify \
205+
{{ retry_function }}
206+
207+
retry 5 60 cosign verify \
206208
--certificate-oidc-issuer https://token.actions.githubusercontent.com \
207209
--certificate-identity-regexp="github.com/get-aurora-dev/common/.github/workflows/*" \
208210
"{{ common }}"
209211
210212
ALL_IMAGES+=("{{ common }}")
211213
212-
cosign verify \
214+
retry 5 60 cosign verify \
213215
--certificate-oidc-issuer https://token.actions.githubusercontent.com \
214216
--certificate-identity-regexp="github.com/coreos/chunkah/.github/workflows/*" \
215217
"{{ chunkah }}"
@@ -218,8 +220,6 @@ build $image=default_image $tag=default_tag $flavor=default_flavor $rechunk="fal
218220
219221
ALL_IMAGES+=("{{ brew }}")
220222
221-
{{ retry_function }}
222-
223223
# I hate this immensely, podman build/pull with --retry does not work for
224224
# transient network issues
225225
if [[ "${retry_pull}" == "true" ]]; then

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,3 @@ sudo mokutil --import public_key.der
4646
## Repobeats
4747

4848
![Alt](https://repobeats.axiom.co/api/embed/c86e98a6654e55f789375ff210dd4eb95f757906.svg "Repobeats analytics image")
49-
50-
## Star History
51-
52-
[![Star History Chart](https://api.star-history.com/svg?repos=ublue-os/aurora&type=Date)](https://www.star-history.com/#ublue-os/aurora&Date)

image-versions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ images:
99
- name: common
1010
image: ghcr.io/get-aurora-dev/common
1111
tag: latest
12-
digest: sha256:a89ec8048e37424da098c564bad6c02243e9e3d41d6f5c536a0cb698fcd25f27
12+
digest: sha256:9c3378b7c3612b3b08b9c79bd0e6fdfa7eaeef31fdbbb9e6ff491b3326d85338
1313

1414
# https://github.com/ublue-os/brew
1515
- name: brew
1616
image: ghcr.io/ublue-os/brew
1717
tag: latest
18-
digest: sha256:ff3a0f6d6d9ff372fbc22e0131800a1755fd5031903ba1d7630050f45f8a476e
18+
digest: sha256:bcd5391e8e2b925e6ad02b8a5b7cfac039a18c419b891d2b244e2758ebe2b9d1
1919

2020
# https://github.com/coreos/chunkah
2121
- name: chunkah

0 commit comments

Comments
 (0)