Merge branch 'trunk' of chtm-lapp-02.lan.chtm.me:nivirx/stevia into trunk

This commit is contained in:
2025-08-22 22:43:40 -04:00
2 changed files with 5 additions and 5 deletions

View File

@@ -17,15 +17,15 @@ jobs:
- name: Install CHTM apt cache endpoint into container
run: |
echo 'Acquire::http::Proxy "http://chtm-aptcache-01.lan.chtm.me:3142";' | sudo tee /etc/apt/apt.conf.d/01aptproxy
echo 'Acquire::http::Proxy "http://chtm-aptcache-01.lan.chtm.me:3142";' | tee /etc/apt/apt.conf.d/01aptproxy
- name: Ensure image is up to date and install build tools and deps
run: |
sudo bash -c "apt update && apt upgrade -y"
sudo apt install -y build-essential nasm fdisk dosfstools
bash -c "apt update && apt upgrade -y"
apt install -y build-essential nasm mount fdisk dosfstools
- name: Build stevia
run: sudo make
run: make
- name: Upload build artifacts
if: always() # still keep logs/artifacts even if build fails

View File

@@ -80,7 +80,7 @@ build/%.bin: src/miniboot32/%.nasm
$(iso): $(mbr_binary_files) $(vbr_binary_files) $(stage2_binary_files) $(boottest_binary_files)
@echo root access needed to create disk image...
@sudo scripts/create-disk.sh
@scripts/create-disk.sh
$(isoz): $(iso)
@gzip -9kc $(iso) > $(isoz)