Merge pull request #34 from Ultramarine-Linux/revert-32-bump-41

Revert "chore: set UM version to 41"
Ultramarine-Linux · Aug 18, 2024 · bdd3791 · bdd3791
2 parents 2bbb482 + fb9711f
commit bdd3791
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 65 deletions.
diff --git 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,57 +137,58 @@ 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
           buildah manifest add $MANIFEST oci-archive:base-base-docker-aarch64-docker/katsu.tar.xz --arch arm64
           # 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/[email protected]
-        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/[email protected]
+          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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,7 +2,7 @@ builder: dnf
 
 dnf:
   repodir: repodir/
-  releasever: 41
+  releasever: 40
   options:
     - --setopt=cachedir=/var/cache/dnf
     - --setopt=keepcache=True