From bb321f3ec2ec69b16d2aff280be58d4c7585c608 Mon Sep 17 00:00:00 2001
From: Bensong Liu <bensl@microsoft.com>
Date: Tue, 8 Dec 2020 17:20:06 +0800
Subject: [PATCH] add ci

---
 .gitlab-ci.yml  | 20 ++++++++++++++++++++
 Makefile        |  5 +++++
 kernel/Makefile |  4 ----
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..6214c68
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,20 @@
+image: archlinux/base
+
+stages: 
+    - build
+
+before_script:
+    - pacman -Sy
+    - pacman -S --noconfirm nasm gcc make
+
+build32:
+    stage: build
+    script:
+        - make BITS=32
+
+build64:
+    stage: build
+    script:
+        - make BITS=64
+
+
diff --git a/Makefile b/Makefile
index 6347967..131681e 100644
--- a/Makefile
+++ b/Makefile
@@ -24,4 +24,9 @@ assemble-uefi: build
 run-legacy: assemble-legacy
 	qemu-system-x86_64 legacy.img
 
+clean:
+	$(MAKE) -C bootloader-legacy clean
+	# $(MAKE) -C bootloader-uefi clean
+	$(MAKE) -C kernel clean
+
 
diff --git a/kernel/Makefile b/kernel/Makefile
index 91ca424..a54af11 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -10,10 +10,6 @@ endif
 
 assemble: kernel head
 	ld -o kernel.img -Ttext 0x7e00 --oformat binary image_head.o kernel.o -m elf_$(ARCH)
-	# Sector 1 = bootloader, Sector 2 - (512B TO 64K) = kernel
-	# Extend kernel.img to correct size. 
-	test $$(stat -c %s kernel.img) -le 65024
-	truncate --size=65024 kernel.img
 
 head:
 	nasm -f elf$(BITS) -DTARGET_BITS=$(BITS) image_head.asm -o image_head.o
-- 
GitLab