Merge pull request #134 from teverett/master

Github actions CI for linux and OS X

Author: IanSeyler

.github/workflows/main.yml

@@ -0,0 +1,98 @@
+name: CI
+
+on:
+  push:
+    branches: [ '*' ]
+  pull_request:
+    branches: [ '*' ]
+jobs:
+  build-macos:
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: nasm
+      run: brew install nasm
+
+    - name: install qemu
+      run: brew install qemu
+
+    - name: install mtools
+      run: brew install mtools
+
+    - name: install cdrtools
+      run: brew install cdrtools
+
+    - name: Build
+      run: ./baremetal.sh setup
+
+    # this is here just as a QA check to ensure it works on OS X
+    - name: Build img
+      run: ./baremetal.sh setup
+
+    # this is here just as a QA check to ensure it works on OS X
+    - name: Build vdi
+      run: ./baremetal.sh vdi
+
+    # this is here just as a QA check to ensure it works on OS X
+    - name: Build vmdk
+      run: ./baremetal.sh vmdk
+
+    # this is here just as a QA check to ensure it works on OS X
+    - name: Build vpc
+      run: ./baremetal.sh vpc
+
+  build-ubuntu:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: install nasm
+      run: sudo apt install nasm
+
+    - name: install qemu-utils
+      run: sudo apt install qemu-utils
+
+    - name: install mtools
+      run: sudo apt install mtools
+
+    - name: install mkisofs
+      run: sudo apt install mkisofs
+
+    - name: Build img
+      run: ./baremetal.sh setup
+
+    - name: Build vdi
+      run: ./baremetal.sh vdi
+
+    - name: Build vmdk
+      run: ./baremetal.sh vmdk
+
+    - name: Build vpc
+      run: ./baremetal.sh vpc
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: BareMetal_OS.img
+        path: sys/floppy.img
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: BareMetal_OS.vdi
+        path: sys/BareMetal_OS.vdi
+    
+    - uses: actions/upload-artifact@v4
+      with:
+        name: BareMetal_OS.vmdk
+        path: sys/BareMetal_OS.vmdk
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: BareMetal_OS.vpc
+        path: sys/BareMetal_OS.vpc

baremetal.sh

@@ -429,6 +429,12 @@ function baremetal_vmdk {
 	qemu-img convert -O vmdk "$OUTPUT_DIR/baremetal_os.img" "$OUTPUT_DIR/BareMetal_OS.vmdk"
 }
 
+function baremetal_vpc {
+	baremetal_sys_check
+	echo "Creating VPC image..."
+	qemu-img convert -O vpc "$OUTPUT_DIR/baremetal_os.img" "$OUTPUT_DIR/BareMetal_OS.vpc"
+}
+
 function baremetal_bnr {
 	baremetal_build
 	baremetal_install
@@ -471,6 +477,7 @@ function baremetal_help {
 	echo "run-2    - Run a second instance of BareMetal for network testing"
 	echo "vdi      - Generate VDI disk image for VirtualBox"
 	echo "vmdk     - Generate VMDK disk image for VMware"
+	echo "vpc      - Generate VPC disk image for HyperV"
 	echo "bnr      - Build 'n Run"
 	echo "bnr-uefi - Build 'n Run in UEFI mode"
 	echo "*.app    - Install and run an app"
@@ -515,6 +522,10 @@ elif [ $# -eq 1 ]; then
 		baremetal_install_demos
 	elif [ "$1" == "vdi" ]; then
 		baremetal_vdi
+	elif [ "$1" == "vmdk" ]; then
+		baremetal_vmdk
+	elif [ "$1" == "vpc" ]; then
+		baremetal_vpc
 	elif [ "$1" == "bnr" ]; then
 		baremetal_bnr
 	elif [ "$1" == "bnr-uefi" ]; then