Skip to content

Commit 32a969b

Browse files
committed
fix(ci): use rootful container storage
We are mixing the container storages which leads to failures like this: https://github.com/ublue-os/bluefin/actions/runs/16705420333/job/47283190810?pr=2914 ported: ublue-os/aurora#732 ublue-os/aurora#745 in Aurora it seems to work
1 parent ec3ddcc commit 32a969b

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/reusable-build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,15 @@ jobs:
121121
id: load-rechunk
122122
shell: bash
123123
run: |
124-
just load-rechunk "${{ matrix.base_name }}" \
124+
sudo -E $(command -v just) load-rechunk "${{ matrix.base_name }}" \
125125
"${{ env.DEFAULT_TAG }}" \
126126
"${{ matrix.image_flavor }}"
127127
128128
- name: Secureboot Check
129129
id: secureboot
130130
shell: bash
131131
run: |
132-
just secureboot "${{ matrix.base_name }}" \
132+
sudo -E $(command -v just) secureboot "${{ matrix.base_name }}" \
133133
"${{ env.DEFAULT_TAG }}" \
134134
"${{ matrix.image_flavor }}"
135135
@@ -185,7 +185,7 @@ jobs:
185185
set -euox pipefail
186186
187187
for tag in ${{ steps.generate-tags.outputs.alias_tags }}; do
188-
podman push ${{ env.IMAGE_NAME }}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}:${tag}
188+
sudo -E podman push ${{ env.IMAGE_NAME }}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}:${tag}
189189
done
190190
191191
if [[ "${{ matrix.image_flavor }}" =~ hwe ]]; then
@@ -195,8 +195,8 @@ jobs:
195195
surface_name="${image_name/hwe/surface}"
196196
197197
for tag in ${{ steps.generate-tags.outputs.alias_tags }}; do
198-
podman push ${asus_name}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${asus_name}:${tag}
199-
podman push ${surface_name}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${surface_name}:${tag}
198+
sudo -E podman push ${asus_name}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${asus_name}:${tag}
199+
sudo -E podman push ${surface_name}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${surface_name}:${tag}
200200
done
201201
fi
202202

Justfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,11 @@ build $image="bluefin" $tag="latest" $flavor="main" rechunk="0" ghcr="0" pipelin
244244

245245
# Rechunk
246246
if [[ "{{ rechunk }}" == "1" && "{{ ghcr }}" == "1" && "{{ pipeline }}" == "1" ]]; then
247-
{{ just }} rechunk "${image}" "${tag}" "${flavor}" 1 1
247+
${SUDOIF} {{ just }} rechunk "${image}" "${tag}" "${flavor}" 1 1
248248
elif [[ "{{ rechunk }}" == "1" && "{{ ghcr }}" == "1" ]]; then
249-
{{ just }} rechunk "${image}" "${tag}" "${flavor}" 1
249+
${SUDOIF} {{ just }} rechunk "${image}" "${tag}" "${flavor}" 1
250250
elif [[ "{{ rechunk }}" == "1" ]]; then
251-
{{ just }} rechunk "${image}" "${tag}" "${flavor}"
251+
${SUDOIF} {{ just }} rechunk "${image}" "${tag}" "${flavor}"
252252
fi
253253

254254
# Build Image and Rechunk

0 commit comments

Comments
 (0)