Merge branch 'release/debian-0.2.3'

upmaru · Aug 19, 2024 · 41b02a4 · 41b02a4
2 parents 47cad6f + 5a74b4f
commit 41b02a4
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 23 deletions.
diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
@@ -44,9 +44,9 @@ jobs:
       - name: Build Image
         run: |
           sudo apt-get install debootstrap btrfs-progs dosfstools qemu-utils gdisk -y
-          sudo ~/go/bin/distrobuilder build-dir images/${{matrix.release.distro}}.yml rootfs -o image.serial=${{ steps.generate-serial.outputs.serial }} -o image.architecture=${{matrix.os.arch}} -o image.release=${{matrix.release.version}} -o source.url="http://ftp.us.debian.org/debian"
-          sudo ~/go/bin/distrobuilder pack-incus images/${{matrix.release.distro}}.yml rootfs -o image.serial=${{ steps.generate-serial.outputs.serial }} -o image.architecture=${{matrix.os.arch}} -o image.release=${{matrix.release.version}} -o source.url="http://ftp.us.debian.org/debian"
-          sudo ~/go/bin/distrobuilder pack-incus images/${{matrix.release.distro}}.yml rootfs --vm -o image.serial=${{ steps.generate-serial.outputs.serial }} -o image.architecture=${{matrix.os.arch}} -o image.release=${{matrix.release.version}} -o source.url="http://ftp.us.debian.org/debian"
+          sudo ~/go/bin/distrobuilder build-dir images/${{matrix.release.distro}}.yml rootfs --cache-dir /tmp/build/cache -o image.serial=${{ steps.generate-serial.outputs.serial }} -o image.architecture=${{matrix.os.arch}} -o image.release=${{matrix.release.version}} -o source.url="http://ftp.us.debian.org/debian"
+          sudo ~/go/bin/distrobuilder pack-incus images/${{matrix.release.distro}}.yml rootfs --cache-dir /tmp/build/cache -o image.serial=${{ steps.generate-serial.outputs.serial }} -o image.architecture=${{matrix.os.arch}} -o image.release=${{matrix.release.version}} -o source.url="http://ftp.us.debian.org/debian"
+          sudo ~/go/bin/distrobuilder pack-incus images/${{matrix.release.distro}}.yml rootfs --cache-dir /tmp/build/cache --vm -o image.serial=${{ steps.generate-serial.outputs.serial }} -o image.architecture=${{matrix.os.arch}} -o image.release=${{matrix.release.version}} -o source.url="http://ftp.us.debian.org/debian"
 
       - name: Push
         run: |

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -1,4 +1,4 @@
-name: 'Ubuntu'
+name: "Ubuntu"
 
 on:
   push:
@@ -10,19 +10,29 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        release: [
-          {distro: "ubuntu", version: "jammy"},
-          {distro: "ubuntu", version: "noble"}
-        ]
-        os: [
-          {arch: "aarch64", builder: "ubicloud-standard-2-arm", source: "http://ports.ubuntu.com/ubuntu-ports"},
-          {arch: "x86_64", builder: "warp-ubuntu-latest-x64-2x", source: "http://archive.ubuntu.com/ubuntu"}
-        ]
+        release:
+          [
+            { distro: "ubuntu", version: "jammy" },
+            { distro: "ubuntu", version: "noble" },
+          ]
+        os:
+          [
+            {
+              arch: "aarch64",
+              builder: "ubicloud-standard-2-arm",
+              source: "http://ports.ubuntu.com/ubuntu-ports",
+            },
+            {
+              arch: "x86_64",
+              builder: "warp-ubuntu-latest-x64-2x",
+              source: "http://archive.ubuntu.com/ubuntu",
+            },
+          ]
 
     runs-on: ${{matrix.os.builder}}
     env:
       ImageOS: ubuntu22
-    steps: 
+    steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -71,21 +81,23 @@ jobs:
       max-parallel: 1
       fail-fast: false
       matrix:
-        release: [
-          {distro: "ubuntu", version: "jammy", checks: "ipv4,ipv6"},
-          {distro: "ubuntu", version: "noble", checks: "ipv4,ipv6"}
-        ]
-        os: [
-          {arch: "aarch64", builder: "ubicloud-standard-2-arm"},
-          {arch: "x86_64", builder: "warp-ubuntu-latest-x64-2x"}
-        ]
+        release:
+          [
+            { distro: "ubuntu", version: "jammy", checks: "ipv4,ipv6" },
+            { distro: "ubuntu", version: "noble", checks: "ipv4,ipv6" },
+          ]
+        os:
+          [
+            { arch: "aarch64", builder: "ubicloud-standard-2-arm" },
+            { arch: "x86_64", builder: "warp-ubuntu-latest-x64-2x" },
+          ]
 
     runs-on: ${{matrix.os.builder}}
     env:
       ImageOS: ubuntu22
     steps:
       - uses: actions/download-artifact@v4
-        with: 
+        with:
           name: ${{matrix.release.distro}}-${{matrix.os.arch}}-${{matrix.release.version}}-${{github.run_number}}
 
       - name: Setup IcePAK
@@ -106,4 +118,4 @@ jobs:
         env:
           POLAR_AUTH_TOKEN: ${{ secrets.POLAR_AUTH_TOKEN }}
           POLAR_ENDPOINT: ${{ vars.POLAR_ENDPOINT }}
-          TESTING_IMAGE_SERVER: ${{ secrets.TESTING_IMAGE_SERVER }}
+          TESTING_IMAGE_SERVER: ${{ secrets.TESTING_IMAGE_SERVER }}