Update test builders

Waujito · Nov 29, 2024 · ee9a0d7 · ee9a0d7
1 parent eb544c1
commit ee9a0d7
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 104 deletions.
diff --git a/.github/builder_containers/kernel-6.6.52.Dockerfile b/.github/builder_containers/kernel-6.6.52.Dockerfile
@@ -0,0 +1,12 @@
+FROM ubuntu:24.04
+
+RUN apt update && apt install -y build-essential flex bc bison libelf-dev elfutils libssl-dev wget
+
+RUN wget https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.52.tar.xz -O kernel.tar.xz
+RUN tar -xf kernel.tar.xz
+RUN rm -f kernel.tar.xz
+RUN /bin/bash -c "mv linux-* linux"
+
+WORKDIR /linux
+RUN make defconfig
+RUN make -j$(nproc)
diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
@@ -1,16 +1,16 @@
 name: CI
 
 on:
-  push:
-    branches:
-      - main
-    paths-ignore:
-      - '.editorconfig'
-      - '.gitignore'
-      - 'LICENSE'
-      - 'README.md'
-  workflow_dispatch:
-  pull_request:
+  # push:
+  #   branches:
+  #     - main
+  #   paths-ignore:
+  #     - '.editorconfig'
+  #     - '.gitignore'
+  #     - 'LICENSE'
+  #     - 'README.md'
+  # workflow_dispatch:
+  # pull_request:
 
 jobs:
   prepare:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -85,112 +85,52 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        include:
-          - kernel_version: "6.6.52"
-            source: "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.52.tar.xz"
-            container_version: "24.04"
+        kernel_version:
+          - 6.6.52
+        # include:
+        #   - kernel_version: "6.6.52"
+        #     source: "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.52.tar.xz"
+        #     container_version: "24.04"
+        #
+        #   - kernel_version: "5.15.167"
+        #     source: "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.167.tar.xz"
+        #     container_version: "24.04"
+        #
+        #   - kernel_version: "5.4.284"
+        #     source: "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.284.tar.xz"
+        #     container_version: "24.04"
+        #
+        #   - kernel_version: "4.19.322"
+        #     source: "https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.19.322.tar.xz"
+        #     container_version: "24.04"
+        #
+        #   - kernel_version: "4.4.302"
+        #     source: "https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.4.302.tar.xz"
+        #     container_version: "24.04"
+        #
+        #   - kernel_version: "3.10.108"
+        #     source: "https://cdn.kernel.org/pub/linux/kernel/v3.x/linux-3.10.108.tar.xz"
+        #     container_version: "16.04"
+        #   
+        #   - kernel_version: "3.0.101"
+        #     source: "https://cdn.kernel.org/pub/linux/kernel/v3.x/linux-3.0.101.tar.xz"
+        #     container_version: "14.04"
+    container:
+      image: waujito/kernel_bins:${{ matrix.kernel_version }}
+      options: --user root
 
-          - kernel_version: "5.15.167"
-            source: "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.167.tar.xz"
-            container_version: "24.04"
-
-          - kernel_version: "5.4.284"
-            source: "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.284.tar.xz"
-            container_version: "24.04"
-
-          - kernel_version: "4.19.322"
-            source: "https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.19.322.tar.xz"
-            container_version: "24.04"
-
-          - kernel_version: "4.4.302"
-            source: "https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.4.302.tar.xz"
-            container_version: "24.04"
-
-          - kernel_version: "3.10.108"
-            source: "https://cdn.kernel.org/pub/linux/kernel/v3.x/linux-3.10.108.tar.xz"
-            container_version: "16.04"
-
-          - kernel_version: "3.0.101"
-            source: "https://cdn.kernel.org/pub/linux/kernel/v3.x/linux-3.0.101.tar.xz"
-            container_version: "14.04"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Restore builder from cache
-        id: cache-restore
-        uses: actions/cache/restore@v4
-        with:
-          path: ~/builder.tar
-          key: builder-${{ matrix.kernel_version }}
-
-      - name: Load builder from cache
-        if: steps.cache-restore.outputs.cache-hit == 'true'
-        run: |
-          docker import - builder < ~/builder.tar
-
-      - name: Prepare build env
-        if: steps.cache-restore.outputs.cache-hit != 'true'
-        run: |
-          mkdir ~/linux
-          pwd
-          ls /
-          ls ~
-
-      - name: Obtain kernel
-        if: steps.cache-restore.outputs.cache-hit != 'true'
-        run: |
-          cd ~/linux
-          wget ${{ matrix.source }} -O kernel.tar.xz -q
-          tar -xf kernel.tar.xz
-          rm -f kernel.tar.xz
-          /bin/bash -c "mv linux-* linux"
-          ls
-          ls linux
-
-      - name: Install docker
-        if: steps.cache-restore.outputs.cache-hit != 'true'
-        run: |
-          cd ~/linux
-          docker pull ubuntu:${{ matrix.container_version }}
-          docker container create --name ubu_builder -w / ubuntu:${{ matrix.container_version }} tail -f /dev/null
-          docker container start ubu_builder
-          docker container exec ubu_builder bash -c "apt update && apt install -y build-essential flex bc bison libelf-dev elfutils libssl-dev"
-          docker cp ./linux ubu_builder:/linux
-
-      - name: Build kernel
-        if: steps.cache-restore.outputs.cache-hit != 'true'
-        run: |
-          cd ~/linux
-          docker container exec -w /linux ubu_builder bash -c 'make defconfig'
-          docker container exec -w /linux ubu_builder bash -c 'make -j $(nproc)'
-
-      - name: Export container
-        if: steps.cache-restore.outputs.cache-hit != 'true'
-        run: |
-          cd ~/linux
-          docker container kill ubu_builder
-          docker container export ubu_builder > ubu_builder.tar
-          docker container rm ubu_builder
-          mv ./ubu_builder.tar ~/builder.tar
-          docker import - builder < ~/builder.tar
-
-      - name: Save kernel image to cache
-        if: steps.cache-restore.outputs.cache-hit != 'true'
-        id: cache-save
-        uses: actions/cache/save@v4
-        with:
-          path: ~/builder.tar
-          key: builder-${{ matrix.kernel_version }}
-
       - name: Build kernel module
         id: build
         env:
           VERSION: ${{ needs.prepare.outputs.version }}
           SHA: ${{ needs.prepare.outputs.sha }}
         shell: bash
         run: |
-          docker run --rm -v ./:/youtubeUnblock -w /youtubeUnblock builder make kmake KERNEL_BUILDER_MAKEDIR:=/linux
+          make kmake KERNEL_BUILDER_MAKEDIR:=/linux
           tar -czvf kmod-youtubeUnblock-$VERSION-$SHA-linux-${{ matrix.kernel_version }}.tar.gz kyoutubeUnblock.ko
 
       - name: Upload artifacts