From ce4046d559db69b4d1415edfe147f63367e99be5 Mon Sep 17 00:00:00 2001 From: mintsuki Date: Sun, 16 Oct 2022 01:31:36 +0200 Subject: [PATCH] Revert "ci: Build and check using Alpine instead of Arch" This reverts commit 502f77b30fd82caea3ac7e6fe519df78b37924bc. --- .github/workflows/check.yml | 10 +++++----- .github/workflows/release.yml | 11 ++++------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 12eed641..372ab882 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -6,14 +6,11 @@ jobs: build: name: Check for compilation failures runs-on: ubuntu-latest - container: alpine:edge + container: archlinux:latest steps: - - name: Upgrade container - run: apk update && apk upgrade - - 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 uses: actions/checkout@v3 @@ -26,3 +23,6 @@ jobs: - 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 + + - name: Build the bootloader (GCC, aarch64) + run: ./bootstrap && ./configure CROSS_TOOLCHAIN=aarch64-linux-gnu --enable-werror --enable-uefi-aarch64 && make all && make maintainer-clean diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6ea442fe..c9e520b9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,14 +9,11 @@ jobs: build: name: Build and upload artifacts runs-on: ubuntu-latest - container: alpine:edge + container: archlinux:latest steps: - - name: Upgrade container - run: apk update && apk upgrade - - 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 uses: actions/checkout@v3 @@ -51,10 +48,10 @@ jobs: run: rm build/bin/limine-deploy - 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 - 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 run: cp LICENSE.md build/bin/