diff --git a/.gitea/workflows/onpush.yaml b/.gitea/workflows/onpush.yaml index 227e65a..022d633 100644 --- a/.gitea/workflows/onpush.yaml +++ b/.gitea/workflows/onpush.yaml @@ -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 diff --git a/Makefile b/Makefile index c77f7bd..c568a56 100755 --- a/Makefile +++ b/Makefile @@ -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)