From 33c743a53dc4c3178027777ba4f6b995277e6bc2 Mon Sep 17 00:00:00 2001
From: Humberto Dias <[EMAIL REDACTED]>
Date: Mon, 17 Feb 2025 11:00:05 -0300
Subject: [PATCH] CI: Build for arm64 (#346)
---
.github/workflows/main.yml | 16 +++++++++-------
.github/workflows/watcom.yml | 4 ++--
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2c1267e31..0df2ce16e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,18 +10,20 @@ jobs:
matrix:
platform:
- { name: Windows, os: windows-latest }
- - { name: Linux, os: ubuntu-latest, flags: -GNinja }
- - { name: MacOS, os: macos-latest }
+ - { name: Linux-x86_64, os: ubuntu-24.04, flags: -GNinja }
+ - { name: Linux-arm64, os: ubuntu-24.04-arm, flags: -GNinja }
+ - { name: MacOS-arm, os: macos-latest }
+ - { name: MacOS-intel, os: macos-13 }
steps:
- name: Setup Linux dependencies
- if: runner.os == 'Linux'
+ if: startsWith(runner.os, 'Linux')
run: |
- sudo apt-get update
- sudo apt-get install cmake ninja-build libgl1-mesa-dev libglu1-mesa-dev
+ sudo apt update -q
+ sudo apt install -y cmake ninja-build libgl1-mesa-dev libglu1-mesa-dev
- name: Get sdl12-compat sources
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Get SDL2 headers
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
repository: libsdl-org/SDL
ref: SDL2
diff --git a/.github/workflows/watcom.yml b/.github/workflows/watcom.yml
index 0c9e6c978..81b9e2283 100644
--- a/.github/workflows/watcom.yml
+++ b/.github/workflows/watcom.yml
@@ -16,9 +16,9 @@ jobs:
steps:
- uses: open-watcom/setup-watcom@v0
- name: Get sdl12-compat sources
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
- name: Get SDL2 headers
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
with:
repository: libsdl-org/SDL
ref: SDL2