From f587c23ea938afb406f66cc2ad3d7fe4aff0facf Mon Sep 17 00:00:00 2001 From: mintsuki Date: Fri, 30 Dec 2022 09:14:51 +0100 Subject: [PATCH] Revert "Revert "ci: Build and check using Alpine instead of Arch"" --- .github/workflows/check.yml | 7 +++++-- .github/workflows/release.yml | 11 +++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 3046a768..f3a1669c 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 + run: apk add build-base git autoconf automake nasm mtools llvm clang lld - name: Checkout code uses: actions/checkout@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6a7b912f..8f36af17 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/