diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 67b1e5f..0116f09 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -36,6 +36,8 @@ env: moby-engine podman buildah + https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-39.noarch.rpm + https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-39.noarch.rpm on: push: @@ -110,8 +112,6 @@ jobs: podman save --format oci-archive ghcr.io/ultramarine-linux/ultramarine:39 --output katsu-work/image/katsu.tar.xz popd - - - name: Upload Artifact uses: actions/upload-artifact@v3 with: @@ -154,4 +154,4 @@ jobs: buildah tag $MANIFEST $MANIFEST:latest || : buildah manifest push --all --format v2s2 $MANIFEST docker://$MANIFEST:$RELEASE - #### LIVE ISO #### \ No newline at end of file + #### LIVE ISO #### diff --git a/.github/workflows/build-katsu.yml b/.github/workflows/build-katsu.yml index f2935ab..acaa2d9 100644 --- a/.github/workflows/build-katsu.yml +++ b/.github/workflows/build-katsu.yml @@ -39,6 +39,8 @@ env: buildah which katsu + https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-39.noarch.rpm + https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-39.noarch.rpm on: push: diff --git a/katsu/modules/base/base-disk-aarch64.yaml b/katsu/modules/base/base-disk-aarch64.yaml index abf8552..ee4587f 100644 --- a/katsu/modules/base/base-disk-aarch64.yaml +++ b/katsu/modules/base/base-disk-aarch64.yaml @@ -8,7 +8,6 @@ users: groups: - wheel - import: - base.yaml - base-disk.yaml @@ -40,7 +39,6 @@ disk: filesystem: ext4 mountpoint: / - dnf: releasever: 39 - arch: aarch64 \ No newline at end of file + arch: aarch64 diff --git a/katsu/modules/base/base-disk-x86_64.yaml b/katsu/modules/base/base-disk-x86_64.yaml index 0113d48..dbbba61 100644 --- a/katsu/modules/base/base-disk-x86_64.yaml +++ b/katsu/modules/base/base-disk-x86_64.yaml @@ -8,7 +8,6 @@ users: groups: - wheel - import: - base.yaml - base-disk.yaml @@ -40,6 +39,5 @@ disk: filesystem: ext4 mountpoint: / - dnf: - releasever: 39 \ No newline at end of file + releasever: 39 diff --git a/katsu/modules/base/base-disk.yaml b/katsu/modules/base/base-disk.yaml index 7fa1714..b0e26da 100644 --- a/katsu/modules/base/base-disk.yaml +++ b/katsu/modules/base/base-disk.yaml @@ -4,8 +4,9 @@ dnf: releasever: 39 options: - --setopt=cachedir=/var/cache/dnf - - --nogpgcheck - --setopt=keepcache=True + - --setopt=tsflags= + - --setopt=max_parallel_downloads=20 exclude: - fedora-release* - generic-release* diff --git a/katsu/modules/base/base-docker.yaml b/katsu/modules/base/base-docker.yaml index 6259438..d8a0820 100644 --- a/katsu/modules/base/base-docker.yaml +++ b/katsu/modules/base/base-docker.yaml @@ -5,8 +5,9 @@ dnf: releasever: 39 options: - --setopt=cachedir=/var/cache/dnf - - --nogpgcheck - --setopt=keepcache=True + - --setopt=tsflags=nodocs + - --setopt=max_parallel_downloads=20 exclude: - fedora-release* - generic-release* diff --git a/katsu/modules/base/base.yaml b/katsu/modules/base/base.yaml index 7fce462..ec97624 100644 --- a/katsu/modules/base/base.yaml +++ b/katsu/modules/base/base.yaml @@ -17,10 +17,9 @@ dnf: repodir: repodir options: - --setopt=cachedir=/var/cache/dnf - - --nogpgcheck - --setopt=keepcache=True - - --best - - --allowerasing + - --setopt=tsflags= + - --setopt=max_parallel_downloads=20 exclude: - fedora-release* - generic-release* @@ -83,4 +82,3 @@ dnf: # - ultramarine-repos # - "ultramarine-logos*" - diff --git a/katsu/modules/chromebook/base-cbe.yaml b/katsu/modules/chromebook/base-cbe.yaml index d9d8426..f344f66 100644 --- a/katsu/modules/chromebook/base-cbe.yaml +++ b/katsu/modules/chromebook/base-cbe.yaml @@ -18,10 +18,9 @@ dnf: repodir: ../base/repodir options: - --setopt=cachedir=/var/cache/dnf - - --nogpgcheck - --setopt=keepcache=True - - --best - - --allowerasing + - --setopt=tsflags= + - --setopt=max_parallel_downloads=20 exclude: - fedora-release* - generic-release* diff --git a/katsu/modules/gnome/gnome-chromebook.yaml b/katsu/modules/gnome/gnome-chromebook.yaml index b3d4d61..178a327 100644 --- a/katsu/modules/gnome/gnome-chromebook.yaml +++ b/katsu/modules/gnome/gnome-chromebook.yaml @@ -20,8 +20,6 @@ kernel_cmdline: "quiet rhgb" dnf: releasever: 39 - # options: - # - --setopt=strict=0 packages: - "@ultramarine-gnome-product-environment" - ultramarine-release-gnome diff --git a/katsu/modules/gnome/gnome-live.yaml b/katsu/modules/gnome/gnome-live.yaml index 6db4a52..e25d4a8 100644 --- a/katsu/modules/gnome/gnome-live.yaml +++ b/katsu/modules/gnome/gnome-live.yaml @@ -23,8 +23,6 @@ iso: dnf: releasever: 39 - # options: - # - --setopt=strict=0 packages: - "@ultramarine-gnome-product-environment" - ultramarine-release-gnome diff --git a/katsu/modules/pantheon/pantheon-chromebook.yaml b/katsu/modules/pantheon/pantheon-chromebook.yaml index 3a4fc60..a3e8c86 100644 --- a/katsu/modules/pantheon/pantheon-chromebook.yaml +++ b/katsu/modules/pantheon/pantheon-chromebook.yaml @@ -20,8 +20,6 @@ kernel_cmdline: "quiet rhgb" dnf: releasever: 39 - options: - - --setopt=strict=1 exclude: - gnome-tour - gnome-shell