From 6de34b5adbdec259d28110574fef4461ae80bee2 Mon Sep 17 00:00:00 2001 From: oklopfer <104327997+oklopfer@users.noreply.github.com> Date: Fri, 17 Jan 2025 14:33:50 -0500 Subject: [PATCH] feat: arm64 runners real!!! (#17) Co-authored-by: ook37 --- .github/workflows/pkg-nushell-bin.yml | 4 +++- .github/workflows/pkg-pacstall.yml | 3 ++- manager.py | 8 ++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pkg-nushell-bin.yml b/.github/workflows/pkg-nushell-bin.yml index b4f5f58..cc8518c 100644 --- a/.github/workflows/pkg-nushell-bin.yml +++ b/.github/workflows/pkg-nushell-bin.yml @@ -6,14 +6,16 @@ name: nushell-bin workflow_dispatch: {} jobs: build: - runs-on: ubuntu-latest strategy: matrix: include: - distro: main architecture: amd64 + runner: ubuntu-latest - distro: main architecture: arm64 + runner: ubuntu-24.04-arm + runs-on: ${{ matrix.runner }} steps: - name: Init uses: actions/checkout@v4 diff --git a/.github/workflows/pkg-pacstall.yml b/.github/workflows/pkg-pacstall.yml index 69b7fba..609cac5 100644 --- a/.github/workflows/pkg-pacstall.yml +++ b/.github/workflows/pkg-pacstall.yml @@ -6,12 +6,13 @@ name: pacstall workflow_dispatch: {} jobs: build: - runs-on: ubuntu-latest strategy: matrix: include: - distro: main architecture: all + runner: ubuntu-latest + runs-on: ${{ matrix.runner }} steps: - name: Init uses: actions/checkout@v4 diff --git a/manager.py b/manager.py index 741e373..26fc9bd 100755 --- a/manager.py +++ b/manager.py @@ -114,7 +114,11 @@ def gen_workflow(package_name, package_data): architectures = adjust_architectures(package_data["architectures"]) overflow = package_data["maxOverflow"] matrix_combinations = [ - {"distro": distro, "architecture": arch} + { + "distro": distro, + "architecture": arch, + "runner": "ubuntu-24.04-arm" if arch == "arm64" else "ubuntu-latest" + } for distro, arch in itertools.product(distros, architectures) ] @@ -130,12 +134,12 @@ def gen_workflow(package_name, package_data): }, "jobs": { "build": { - "runs-on": "ubuntu-latest", "strategy": { "matrix": { "include": matrix_combinations } }, + "runs-on": "${{ matrix.runner }}", "steps": [ { "name": "Init",