Skip to content

Improvements #68

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

Merged
joakimnordling merged 3 commits into from
Nov 6, 2025
Merged

Improvements #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0c830b
Simplify the merging of manifests
Nov 5, 2025
c321dbb
Update dibber
Nov 5, 2025
9e1d8ca
...
Nov 5, 2025
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
28 changes: 7 additions & 21 deletions .github/workflows/build-and-upload.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

env:
DOCKER_BUILDKIT: 1
DIBBER_VERSION: 1.1.11
DIBBER_VERSION: 1.1.12
DIBBER_PARALLEL_BUILDS: 8

# Cancel previous builds if a new one is triggered
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
runs-on: faster-arm64

steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

- name: Log in to the Container registry
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
# runs-on: faster-arm64

steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

- name: Log in to the Container registry
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
Expand All @@ -140,7 +140,7 @@ jobs:
password: ${{ secrets.GHCR_PAT }}

- name: Set up Python
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
with:
python-version: "3.13"

Expand All @@ -159,23 +159,9 @@ jobs:

- name: Merge manifests
run: |
# Append AMD64 files to temp files
cat amd64/manifest_data.txt >> tmp_manifest_data.txt
echo "" >> tmp_manifest_data.txt

cat amd64/uniq_ids.txt >> tmp_uniq_ids.txt
echo "" >> tmp_uniq_ids.txt

# Append ARM64 files to temp files
cat arm64/manifest_data.txt >> tmp_manifest_data.txt
echo "" >> tmp_manifest_data.txt

cat arm64/uniq_ids.txt >> tmp_uniq_ids.txt
echo "" >> tmp_uniq_ids.txt

# Sort + filter to target files
cat tmp_manifest_data.txt | sort -u | grep -v '^[[:space:]]*$' > manifest_data.txt
cat tmp_uniq_ids.txt | sort -u | grep -v '^[[:space:]]*$' > uniq_ids.txt
# Merge and sort manifest and uniq ids
cat amd64/manifest_data.txt arm64/manifest_data.txt | sort -u > manifest_data.txt
cat amd64/uniq_ids.txt arm64/uniq_ids.txt | sort -u > uniq_ids.txt

echo
echo "---- Manifest data ----"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scan-images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

env:
DOCKER_BUILDKIT: 1
DIBBER_VERSION: 1.1.11
DIBBER_VERSION: 1.1.12

jobs:
build:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,3 +146,6 @@ cython_debug/
.DS_Store

.python-version

/manifest_data.txt
/uniq_ids.txt