fix aarch64 compile by specifying sysroot, revert no cross-building,

always install cross-build deps
This commit is contained in:
csd4ni3l
2026-06-01 00:19:14 +02:00
parent 4b85a7c8c3
commit 880c589950
2 changed files with 7 additions and 20 deletions
+6 -19
View File
@@ -1,10 +1,8 @@
name: Build & Release XunilOS name: Build & Release XunilOS
on: on:
push: push:
branches: branches:
- main - main
jobs: jobs:
build: build:
name: Build (${{ matrix.karch }}) name: Build (${{ matrix.karch }})
@@ -12,7 +10,6 @@ jobs:
strategy: strategy:
matrix: matrix:
karch: [x86_64, aarch64] karch: [x86_64, aarch64]
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
@@ -20,27 +17,17 @@ jobs:
submodules: recursive submodules: recursive
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: Install build dependencies (x86_64) - name: Install build dependencies
if: matrix.karch == 'x86_64'
run: |
sudo apt-get update
sudo apt-get install -y \
build-essential \
gcc \
gcc-multilib \
xorriso \
curl \
ccache \
mold
- name: Install build dependencies (aarch64)
if: matrix.karch == 'aarch64'
run: | run: |
sudo dpkg --add-architecture arm64
sudo apt-get update sudo apt-get update
sudo apt-get install -y \ sudo apt-get install -y \
build-essential \ build-essential \
gcc-x86_64-linux-gnu \
gcc-aarch64-linux-gnu \ gcc-aarch64-linux-gnu \
binutils-x86_64-linux-gnu \
binutils-aarch64-linux-gnu \ binutils-aarch64-linux-gnu \
libc6-dev-amd64-cross \
libc6-dev-arm64-cross \ libc6-dev-arm64-cross \
xorriso \ xorriso \
curl \ curl \
@@ -73,13 +60,13 @@ jobs:
needs: build needs: build
permissions: permissions:
contents: write contents: write
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: Download x86_64 ISO - name: Download x86_64 ISO
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with: