From fb9711f1da87e2a26a498303bde2d0ba9bf1787c Mon Sep 17 00:00:00 2001 From: lea Date: Sat, 17 Aug 2024 21:08:23 -0700 Subject: [PATCH 1/5] Revert "chore: set UM version to 41" --- .github/workflows/build-docker.yml | 95 +++++++++++---------- .github/workflows/build-katsu.yml | 16 ++-- katsu/modules/base/base-disk-aarch64.yaml | 4 +- katsu/modules/base/base-disk-x86_64.yaml | 4 +- katsu/modules/base/base-disk.yaml | 2 +- katsu/modules/base/base-docker-aarch64.yaml | 4 +- katsu/modules/base/base-docker-x86_64.yaml | 4 +- katsu/modules/base/base-docker.yaml | 2 +- 8 files changed, 66 insertions(+), 65 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 1c45818f..04f16dd5 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -37,16 +37,16 @@ env: podman buildah katsu - https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-41.noarch.rpm - https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-41.noarch.rpm + https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-40.noarch.rpm + https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-40.noarch.rpm REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} on: push: - branches: ["um41"] + branches: [ "um40" ] workflow_dispatch: pull_request: - branches: ["um41"] + branches: [ "um40" ] jobs: #### DOCKER ###### @@ -64,7 +64,7 @@ jobs: # ubuntu-latest unless we're building aarch64 runs-on: ${{ endsWith(matrix.variant, '-aarch64') && 'arm64' || 'ubuntu-latest' }} container: - image: ghcr.io/terrapkg/builder:f41 + image: ghcr.io/terrapkg/builder:f40 # Pass /dev from host to container # Very hacky, but it works # Microsoft/Github, if you're reading this, @@ -100,9 +100,9 @@ jobs: host_arch="arm64" fi - # tarball katsu-work/chroot then import using podman with tag ghcr.io/ultramarine-linux/ultramarine:41 - tar -C katsu-work/chroot -c . | podman import --change='CMD ["/usr/bin/bash"]' - ghcr.io/ultramarine-linux/ultramarine:41 --arch $host_arch - podman save --format oci-archive ghcr.io/ultramarine-linux/ultramarine:41 --output katsu-work/image/katsu.tar.xz + # tarball katsu-work/chroot then import using podman with tag ghcr.io/ultramarine-linux/ultramarine:40 + tar -C katsu-work/chroot -c . | podman import --change='CMD ["/usr/bin/bash"]' - ghcr.io/ultramarine-linux/ultramarine:40 --arch $host_arch + podman save --format oci-archive ghcr.io/ultramarine-linux/ultramarine:40 --output katsu-work/image/katsu.tar.xz popd - name: Upload Artifact @@ -137,7 +137,7 @@ jobs: run: | set -x MANIFEST="ghcr.io/ultramarine-linux/ultramarine" - RELEASE="41" + RELEASE="40" ls -lR buildah manifest create $MANIFEST buildah manifest add $MANIFEST oci-archive:base-base-docker-x86_64-docker/katsu.tar.xz --arch amd64 @@ -145,49 +145,50 @@ jobs: # also tag as latest buildah tag $MANIFEST $MANIFEST:latest || : buildah manifest push --all --format v2s2 $MANIFEST docker://$MANIFEST:$RELEASE - + docker-layer: permissions: - contents: read - packages: write + contents: read + packages: write runs-on: ubuntu-latest needs: docker-push strategy: - fail-fast: true - matrix: - version: - - 41 - docker: - - dockerfile: dockerfiles/devtools.dockerfile - image: ghcr.io/ultramarine-linux/ultramarine-devtools - - dockerfile: dockerfiles/gitpod.dockerfile - image: ghcr.io/ultramarine-linux/ultramarine-gitpod - + fail-fast: true + matrix: + version: + - 40 + docker: + - dockerfile: dockerfiles/devtools.dockerfile + image: ghcr.io/ultramarine-linux/ultramarine-devtools + - dockerfile: dockerfiles/gitpod.dockerfile + image: ghcr.io/ultramarine-linux/ultramarine-gitpod + steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Log into registry ${{ env.REGISTRY }} - uses: docker/login-action@v2.1.0 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build images - uses: docker/build-push-action@v6 - with: - context: . - file: ${{ matrix.docker.dockerfile }} - platforms: linux/amd64,linux/arm64 - push: true - tags: | - ${{ matrix.docker.image }}:${{ matrix.version }} - ${{ matrix.docker.image }}:latest - build-args: | - RELEASE=${{ matrix.version }} + - name: Checkout + uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Log into registry ${{ env.REGISTRY }} + uses: docker/login-action@v2.1.0 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build images + uses: docker/build-push-action@v6 + with: + context: . + file: ${{ matrix.docker.dockerfile }} + platforms: linux/amd64,linux/arm64 + push: true + tags: | + ${{ matrix.docker.image }}:${{ matrix.version }} + ${{ matrix.docker.image }}:latest + build-args: | + RELEASE=${{ matrix.version }} + #### LIVE ISO #### diff --git a/.github/workflows/build-katsu.yml b/.github/workflows/build-katsu.yml index 155bb117..25a3ad1b 100644 --- a/.github/workflows/build-katsu.yml +++ b/.github/workflows/build-katsu.yml @@ -38,15 +38,15 @@ env: podman buildah katsu - https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-41.noarch.rpm - https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-41.noarch.rpm + https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-40.noarch.rpm + https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-40.noarch.rpm on: push: - branches: ["um41"] + branches: ["um40"] workflow_dispatch: pull_request: - branches: ["um41"] + branches: ["um40"] jobs: #### BASE IMAGES #### @@ -79,7 +79,7 @@ jobs: variant: xfce/xfce-chromebook runs-on: ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'arm64' }} container: - image: ghcr.io/terrapkg/builder:f41 + image: ghcr.io/terrapkg/builder:f40 # Pass /dev from host to container # Very hacky, but it works # Microsoft/Github, if you're reading this, @@ -136,7 +136,7 @@ jobs: - xfce/xfce-live runs-on: ${{ matrix.arch == 'x86_64' && matrix.variant == 'kde/kde-live' && 'x86-64-lg' || matrix.arch == 'x86_64' && 'ubuntu-latest' || 'arm64' }} container: - image: ghcr.io/terrapkg/builder:f41 + image: ghcr.io/terrapkg/builder:f40 # Pass /dev from host to container # Very hacky, but it works # Microsoft/Github, if you're reading this, @@ -192,7 +192,7 @@ jobs: push-image: runs-on: arm64 container: - image: ghcr.io/terrapkg/builder:f41 + image: ghcr.io/terrapkg/builder:f40 environment: production needs: - live-iso @@ -224,7 +224,7 @@ jobs: type=$2 - IMAGEDIR=images/$type/ultramarine/41/ + IMAGEDIR=images/$type/ultramarine/40/ mkdir -p $IMAGEDIR filename=$(basename -- "$file") diff --git a/katsu/modules/base/base-disk-aarch64.yaml b/katsu/modules/base/base-disk-aarch64.yaml index d13a3962..34ff1d3a 100644 --- a/katsu/modules/base/base-disk-aarch64.yaml +++ b/katsu/modules/base/base-disk-aarch64.yaml @@ -1,5 +1,5 @@ builder: dnf -distro: Ultramarine Linux 41 +distro: Ultramarine Linux 40 # users: # - username: ultramarine @@ -13,7 +13,7 @@ import: - base-disk.yaml dnf: - releasever: 41 + releasever: 40 arch: aarch64 packages: - ultramarine-release-identity-basic diff --git a/katsu/modules/base/base-disk-x86_64.yaml b/katsu/modules/base/base-disk-x86_64.yaml index e7269210..01cbe186 100644 --- a/katsu/modules/base/base-disk-x86_64.yaml +++ b/katsu/modules/base/base-disk-x86_64.yaml @@ -1,5 +1,5 @@ builder: dnf -distro: Ultramarine Linux 41 +distro: Ultramarine Linux 40 # users: # - username: ultramarine @@ -13,7 +13,7 @@ import: - base-disk.yaml dnf: - releasever: 41 + releasever: 40 packages: - ultramarine-release-identity-basic - ultramarine-release-basic diff --git a/katsu/modules/base/base-disk.yaml b/katsu/modules/base/base-disk.yaml index 172c98c4..6080c201 100644 --- a/katsu/modules/base/base-disk.yaml +++ b/katsu/modules/base/base-disk.yaml @@ -7,7 +7,7 @@ scripts: name: Extra configuration for disk images file: disk-setup.sh dnf: - releasever: 41 + releasever: 40 options: - --setopt=cachedir=/var/cache/dnf - --setopt=keepcache=True diff --git a/katsu/modules/base/base-docker-aarch64.yaml b/katsu/modules/base/base-docker-aarch64.yaml index 41ed7fb5..4ea61f53 100644 --- a/katsu/modules/base/base-docker-aarch64.yaml +++ b/katsu/modules/base/base-docker-aarch64.yaml @@ -1,9 +1,9 @@ builder: dnf -distro: Ultramarine Linux 41 Container +distro: Ultramarine Linux 40 Container import: - base-docker.yaml dnf: - releasever: 41 + releasever: 40 arch: aarch64 diff --git a/katsu/modules/base/base-docker-x86_64.yaml b/katsu/modules/base/base-docker-x86_64.yaml index a89bf1d3..80bca9a7 100644 --- a/katsu/modules/base/base-docker-x86_64.yaml +++ b/katsu/modules/base/base-docker-x86_64.yaml @@ -1,9 +1,9 @@ builder: dnf -distro: Ultramarine Linux 41 Container +distro: Ultramarine Linux 40 Container import: - base-docker.yaml dnf: - releasever: 41 + releasever: 40 arch: x86_64 diff --git a/katsu/modules/base/base-docker.yaml b/katsu/modules/base/base-docker.yaml index 52400239..b54b5090 100644 --- a/katsu/modules/base/base-docker.yaml +++ b/katsu/modules/base/base-docker.yaml @@ -2,7 +2,7 @@ builder: dnf dnf: repodir: repodir/ - releasever: 41 + releasever: 40 options: - --setopt=cachedir=/var/cache/dnf - --setopt=keepcache=True From e743835e95854825d5ab46a72c66b87590605fd6 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Wed, 21 Aug 2024 20:30:22 +0700 Subject: [PATCH 2/5] Add priority 50 to initial-setup script --- katsu/modules/base/base-disk.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/katsu/modules/base/base-disk.yaml b/katsu/modules/base/base-disk.yaml index 6080c201..0feae316 100644 --- a/katsu/modules/base/base-disk.yaml +++ b/katsu/modules/base/base-disk.yaml @@ -3,6 +3,7 @@ scripts: - id: initial-setup name: Enable Initial Setup file: initial-setup.sh + priority: 50 - id: disk-setup name: Extra configuration for disk images file: disk-setup.sh From cca598544b0b8eb93cae2993cb4461cd364ecfe8 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Wed, 21 Aug 2024 20:34:20 +0700 Subject: [PATCH 3/5] move initial-setup to base.yaml so it gets enabled on all builds --- katsu/modules/base/base-disk.yaml | 4 ---- katsu/modules/base/base.yaml | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/katsu/modules/base/base-disk.yaml b/katsu/modules/base/base-disk.yaml index 0feae316..a27da714 100644 --- a/katsu/modules/base/base-disk.yaml +++ b/katsu/modules/base/base-disk.yaml @@ -1,9 +1,5 @@ scripts: post: - - id: initial-setup - name: Enable Initial Setup - file: initial-setup.sh - priority: 50 - id: disk-setup name: Extra configuration for disk images file: disk-setup.sh diff --git a/katsu/modules/base/base.yaml b/katsu/modules/base/base.yaml index 0e1b94ba..44aa9866 100644 --- a/katsu/modules/base/base.yaml +++ b/katsu/modules/base/base.yaml @@ -3,6 +3,10 @@ scripts: - id: cleanup name: Clean up system file: cleanup.sh + - id: initial-setup + name: Enable Initial Setup + file: initial-setup.sh + priority: 50 - id: selinux-setup name: Set up SELinux file: selinux.sh From ce4bd4f03901be584c1924839fb5facadfa807b0 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Wed, 21 Aug 2024 20:36:54 +0700 Subject: [PATCH 4/5] GIS: run after initial-setup script --- katsu/modules/gnome/gnome.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/katsu/modules/gnome/gnome.yaml b/katsu/modules/gnome/gnome.yaml index 126eaef8..86d1fd7a 100644 --- a/katsu/modules/gnome/gnome.yaml +++ b/katsu/modules/gnome/gnome.yaml @@ -9,4 +9,5 @@ scripts: post: - id: gnome-initial-setup name: Set GNOME Initial Setup to run - file: gnome-initial-setup.sh \ No newline at end of file + file: gnome-initial-setup.sh + priority: 51 \ No newline at end of file From 6e17ef93d7b08ae3432bfa674ef095af6cd9bd52 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Thu, 22 Aug 2024 00:15:05 +0700 Subject: [PATCH 5/5] revert initial setup to disk only --- katsu/modules/base/base-disk.yaml | 4 ++++ katsu/modules/base/base.yaml | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/katsu/modules/base/base-disk.yaml b/katsu/modules/base/base-disk.yaml index a27da714..69c3f87e 100644 --- a/katsu/modules/base/base-disk.yaml +++ b/katsu/modules/base/base-disk.yaml @@ -3,6 +3,10 @@ scripts: - id: disk-setup name: Extra configuration for disk images file: disk-setup.sh + - id: initial-setup + name: Enable Initial Setup + file: initial-setup.sh + priority: 50 dnf: releasever: 40 options: diff --git a/katsu/modules/base/base.yaml b/katsu/modules/base/base.yaml index 44aa9866..0e1b94ba 100644 --- a/katsu/modules/base/base.yaml +++ b/katsu/modules/base/base.yaml @@ -3,10 +3,6 @@ scripts: - id: cleanup name: Clean up system file: cleanup.sh - - id: initial-setup - name: Enable Initial Setup - file: initial-setup.sh - priority: 50 - id: selinux-setup name: Set up SELinux file: selinux.sh