Revert "ci: Build and check using Alpine instead of Arch"
This reverts commit 0124dec8f833ae3baf1381ab2bb02d466aaab13d.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index f3a1669c..3046a768 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
- name: Checkout code
uses: actions/checkout@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d8fb78ea..d77f937f 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/
