Update build.yml and .gitignore

gsingh93 · Jan 24, 2023 · 75336ca · 75336ca
1 parent b0b406f
commit 75336ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -179,7 +179,7 @@ jobs:
         ROOTFS=./rootfs-${{ matrix.arch }} make rootfs-init
 
         make cpio
-        INITRAMFS_DIR=./rootfs/alpine-${{ matrix.arch }} make cpio CPIO_FILE=../../alpine-${{ matrix.arch }}.cpio.gz
+        ROOTFS_DIR=./rootfs/alpine-${{ matrix.arch }} make cpio
 
     - name: Setup shared/init.sh
       run: |
@@ -193,7 +193,7 @@ jobs:
       run: |
         QEMU_KERNEL_IMAGE=./kernel-image/$IMAGE_NAME make run
         QEMU_KERNEL_IMAGE=./kernel-image/$IMAGE_NAME ROOTFS=./rootfs-${{ matrix.arch }} make run
-        QEMU_KERNEL_IMAGE=./kernel-image/$IMAGE_NAME INITRD=./alpine-${{ matrix.arch }}.cpio.gz make run
+        QEMU_KERNEL_IMAGE=./kernel-image/$IMAGE_NAME INITRD=1 make run
         QEMU_KERNEL_IMAGE=./kernel-image/$IMAGE_NAME CPU=2 MEM=2048M QEMU_EXTRA_ARGS="" QEMU_EXTRA_KERNEL_CMDLINE="nokaslr" make run
 
     - name: Upload rootfs artifact

diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 /rootfs/*.cpio.gz
 /rootfs/alpine-*/
 
+/toolchain
 /shared
 /out
 /.cache
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     /rootfs/*.cpio.gz
     /rootfs/alpine-*/
+    /toolchain
     /shared
     /out
     /.cache
@@ Expand Down @@