chore(ci): switch to f40

FyraLabs · May 14, 2024 · b0822bd · b0822bd
1 parent ca41746
commit b0822bd
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 49 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -41,7 +41,7 @@ jobs:
   image-arm:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f40
       # Pass /dev from host to container
       # Very hacky, but it works
       # Microsoft/Github, if you're reading this,
@@ -138,7 +138,6 @@ jobs:
           name: image-x86_64
           path: tests/ng/katsu-work/image/*.raw.xz
 
-
   iso-x86_64:
     runs-on: ubuntu-latest
     container:
@@ -189,7 +188,6 @@ jobs:
           name: iso-x86_64
           path: tests/ng/katsu-work/image/*.iso.xz
 
-
   iso-limine-x86_64:
     runs-on: ubuntu-latest
     container:
@@ -240,8 +238,6 @@ jobs:
           name: iso-limine-x86_64
           path: tests/ng/katsu-work/image/*.iso.xz
 
-
-
   fs-test-x86_64:
     runs-on: ubuntu-latest
     container:
@@ -291,4 +287,3 @@ jobs:
         with:
           name: iso-limine-x86_64
           path: tests/ng/katsu-work/chroot.tar.xz
-
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -38,50 +38,45 @@ env:
     isomd5sum
 
 jobs:
-    build:
-        strategy:
-          matrix:
-            arch: [x86_64, aarch64]
+  build:
+    strategy:
+      matrix:
+        arch: [x86_64, aarch64]
 
-        # run job on ubuntu-latest unless aarch64 then arm64
-        runs-on: ${{ matrix.arch == 'aarch64' && 'arm64' || 'ubuntu-latest' }}
+    # run job on ubuntu-latest unless aarch64 then arm64
+    runs-on: ${{ matrix.arch == 'aarch64' && 'arm64' || 'ubuntu-latest' }}
 
-        container:
-            image: ghcr.io/terrapkg/builder:f38
+    container:
+      image: ghcr.io/terrapkg/builder:f40
 
-        steps:
-            - uses: actions/checkout@v4
+    steps:
+      - uses: actions/checkout@v4
 
-            - name: Install dependencies
-              run: |
-                dnf install -y $DNF_PKGS
+      - name: Install dependencies
+        run: |
+          dnf install -y $DNF_PKGS
 
-            - uses: actions-rs/toolchain@v1
-              with:
-                profile: minimal
-                toolchain: stable
-                override: true
-
-            - name: Build
-              run:
-                cargo build --release
-
-            - name: Upload artifacts
-              uses: actions/upload-artifact@v2
-              with:
-                name: ${{ matrix.arch }}
-                path: target/release/terra
-
-
-            - name: Add binary to release
-              uses: svenstaro/upload-release-action@v2
-              with:
-                  repo_token: ${{ secrets.GITHUB_TOKEN }}
-                  file: target/release/katsu
-                  asset_name: katsu-${{ matrix.arch }}
-                  tag: ${{ github.ref }}
-                  # release_name: ${{ github.ref }}
-                  overwrite: true
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
 
+      - name: Build
+        run: cargo build --release
 
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ matrix.arch }}
+          path: target/release/terra
 
+      - name: Add binary to release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: target/release/katsu
+          asset_name: katsu-${{ matrix.arch }}
+          tag: ${{ github.ref }}
+          # release_name: ${{ github.ref }}
+          overwrite: true
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,7 +21,7 @@ env:
 jobs:
   check:
     container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f40
     name: Check
     runs-on: ubuntu-latest
     steps:
@@ -48,7 +48,7 @@ jobs:
   clippy:
     name: Clippy
     container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f40
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -76,7 +76,7 @@ jobs:
   unit-test:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f40
 
     steps:
       - uses: actions/checkout@v4

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/terrapkg/builder:f38
+FROM ghcr.io/terrapkg/builder:f40
 
 RUN dnf install -y \
     xorriso \