Skip to content

Commit 26f145a

Browse files
committed
Merge branch 'main' into rpm-ostree-rechunker
2 parents 380c4fb + f689917 commit 26f145a

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

.github/workflows/reusable-build.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,15 @@ jobs:
4242
- name: Checkout
4343
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
4444

45-
- name: Maximize build space
46-
uses: ublue-os/remove-unwanted-software@695eb75bc387dbcd9685a8e72d23439d8686cba6 # v10
45+
# mount /mnt as /var/lib/containers
46+
- name: Mount BTRFS for podman storage
47+
id: container-storage-action
48+
uses: ublue-os/container-storage-action@dc1f4c8f17b672069e921f001132f7cf98a423a6
49+
continue-on-error: true
50+
with:
51+
target-dir: /var/lib/containers
52+
mount-opts: compress-force=zstd:2
53+
loopback-free: '1'
4754

4855
- name: Setup Just
4956
uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3

build_files/base/17-cleanup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ systemctl enable input-remapper.service
2323
systemctl enable flatpak-nuke-fedora.service
2424

2525
# TODO: Reinvestigate when bazaar gains dbus activation
26-
systemctl --global enable bazaar.service
26+
# systemctl --global enable bazaar.service
2727

2828
# run flatpak preinstall once at startup
2929
systemctl enable flatpak-preinstall.service

image-versions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ images:
22
- name: kinoite
33
image: quay.io/fedora-ostree-desktops/kinoite
44
tag: 43
5-
digest: sha256:cc64abd1c81ecd377c243739844893e043801f2520881f3a420733fae0161723
5+
digest: sha256:858048d459c5b72d50155ce168745b6c181966b64429007d275f5aa51a8c2efb
66
- name: common
77
image: ghcr.io/get-aurora-dev/common
88
tag: latest
9-
digest: sha256:0b2263391da6cc03ebca00d0f3eb5be5c7769428fc8d00329878f79b36909546
9+
digest: sha256:38b7ed5f77b7da92592742a7994f78ddc56b85ada21ae431b6d91f8e485554d6
1010
- name: brew
1111
image: ghcr.io/ublue-os/brew
1212
tag: latest

0 commit comments

Comments
 (0)