Revert "ci: Build and check using Alpine instead of Arch"

This reverts commit 502f77b30f.
This commit is contained in:
mintsuki 2022-10-16 01:31:36 +02:00
parent 7e1d4a9870
commit ce4046d559
2 changed files with 9 additions and 12 deletions

View File

@ -6,14 +6,11 @@ jobs:
build: build:
name: Check for compilation failures name: Check for compilation failures
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: alpine:edge container: archlinux:latest
steps: steps:
- name: Upgrade container
run: apk update && apk upgrade
- name: Install dependencies - name: Install dependencies
run: apk add build-base git autoconf automake nasm mtools llvm clang lld run: pacman --noconfirm -Syu && pacman --needed --noconfirm -S base-devel git autoconf automake nasm curl mtools llvm clang lld aarch64-linux-gnu-gcc
- name: Checkout code - name: Checkout code
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -26,3 +23,6 @@ jobs:
- name: Build the bootloader (GCC, x86) - name: Build the bootloader (GCC, x86)
run: ./bootstrap && ./configure CROSS_CC=gcc CROSS_LD=ld CROSS_OBJCOPY=objcopy CROSS_OBJDUMP=objdump CROSS_READELF=readelf --enable-werror --enable-bios --enable-uefi-ia32 --enable-uefi-x86_64 && make all && make maintainer-clean run: ./bootstrap && ./configure CROSS_CC=gcc CROSS_LD=ld CROSS_OBJCOPY=objcopy CROSS_OBJDUMP=objdump CROSS_READELF=readelf --enable-werror --enable-bios --enable-uefi-ia32 --enable-uefi-x86_64 && make all && make maintainer-clean
- name: Build the bootloader (GCC, aarch64)
run: ./bootstrap && ./configure CROSS_TOOLCHAIN=aarch64-linux-gnu --enable-werror --enable-uefi-aarch64 && make all && make maintainer-clean

View File

@ -9,14 +9,11 @@ jobs:
build: build:
name: Build and upload artifacts name: Build and upload artifacts
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: alpine:edge container: archlinux:latest
steps: steps:
- name: Upgrade container
run: apk update && apk upgrade
- name: Install dependencies - name: Install dependencies
run: apk add build-base xz git autoconf automake nasm mtools llvm clang lld mingw-w64-gcc openssh run: pacman --noconfirm -Syu && pacman --needed --noconfirm -S base-devel git autoconf automake nasm curl mtools llvm clang lld mingw-w64-gcc openssh
- name: Checkout code - name: Checkout code
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -51,10 +48,10 @@ jobs:
run: rm build/bin/limine-deploy run: rm build/bin/limine-deploy
- name: Build limine-deploy-win32 - name: Build limine-deploy-win32
run: make -C build/bin CC="x86_64-w64-mingw32-gcc" CFLAGS="-O2 -pipe" limine-deploy run: make -C build/bin CC="i686-w64-mingw32-gcc" CFLAGS="-O2 -pipe" limine-deploy
- name: Strip limine-deploy-win32 - name: Strip limine-deploy-win32
run: x86_64-w64-mingw32-strip build/bin/limine-deploy.exe run: i686-w64-mingw32-strip build/bin/limine-deploy.exe
- name: Copy LICENSE to bin - name: Copy LICENSE to bin
run: cp LICENSE.md build/bin/ run: cp LICENSE.md build/bin/