From dffd45a6888f04a97c27cd7840127b1bef5ff3cf Mon Sep 17 00:00:00 2001
From: mintsuki <mintsuki@protonmail.com>
Date: Fri, 30 Dec 2022 09:04:45 +0100
Subject: [PATCH] Revert "Revert "ci: Build and check using Alpine instead of
 Arch""

This reverts commit ce4046d559db69b4d1415edfe147f63367e99be5.
---
 .github/workflows/check.yml   | 10 +++++-----
 .github/workflows/release.yml | 11 +++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 372ab882..12eed641 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -6,11 +6,14 @@ jobs:
   build:
     name: Check for compilation failures
     runs-on: ubuntu-latest
-    container: archlinux:latest
+    container: alpine:edge
 
     steps:
+      - name: Upgrade container
+        run: apk update && apk upgrade
+
       - name: Install dependencies
-        run: pacman --noconfirm -Syu && pacman --needed --noconfirm -S base-devel git autoconf automake nasm curl mtools llvm clang lld aarch64-linux-gnu-gcc
+        run: apk add build-base git autoconf automake nasm mtools llvm clang lld
 
       - name: Checkout code
         uses: actions/checkout@v3
@@ -23,6 +26,3 @@ 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 ae7693a2..2059d6fc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,11 +9,14 @@ jobs:
   build:
     name: Build and upload artifacts
     runs-on: ubuntu-latest
-    container: archlinux:latest
+    container: alpine:edge
 
     steps:
+      - name: Upgrade container
+        run: apk update && apk upgrade
+
       - name: Install dependencies
-        run: pacman --noconfirm -Syu && pacman --needed --noconfirm -S base-devel git autoconf automake nasm curl mtools llvm clang lld mingw-w64-gcc openssh
+        run: apk add build-base xz git autoconf automake nasm mtools llvm clang lld mingw-w64-gcc openssh
 
       - name: Checkout code
         uses: actions/checkout@v3
@@ -48,10 +51,10 @@ jobs:
         run: rm build/bin/limine-deploy
 
       - name: Build limine-deploy-win32
-        run: make -C build/bin CC="i686-w64-mingw32-gcc" CFLAGS="-O2 -pipe" limine-deploy
+        run: make -C build/bin CC="x86_64-w64-mingw32-gcc" CFLAGS="-O2 -pipe" limine-deploy
 
       - name: Strip limine-deploy-win32
-        run: i686-w64-mingw32-strip build/bin/limine-deploy.exe
+        run: x86_64-w64-mingw32-strip build/bin/limine-deploy.exe
 
       - name: Copy LICENSE to bin
         run: cp LICENSE.md build/bin/