mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-05 15:49:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

CI: Use arch variable in ci.yml instead of always using 'Lagom'

Browse source 
This was a relic from the SerenityOS CI, where architecture meant
what architecture to build Serenity for. For just ladybird, we might
want to build ladybird for multiple architectures per OS.
This commit is contained in:
Andrew Kaster 2025-01-20 08:04:39 -07:00 • committed by Jelle Raaijmakers
commit 34bf42cffa
Notes: github-actions[bot] 2025-02-21 11:06:52 +00:00
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/ci.yml vendored
View file

@ -16,6 +16,7 @@ jobs:
matrix: matrix:
os_name: ['Linux'] os_name: ['Linux']
os: [ubuntu-24.04] os: [ubuntu-24.04]
arch: ['x86_64']
fuzzer: ['NO_FUZZ'] fuzzer: ['NO_FUZZ']
toolchain: ['GNU'] toolchain: ['GNU']
clang_plugins: [false] clang_plugins: [false]
@ -23,18 +24,21 @@ jobs:
include: include:
- os_name: 'Linux' - os_name: 'Linux'
os: ubuntu-24.04 os: ubuntu-24.04
arch: 'x86_64'
fuzzer: 'NO_FUZZ' fuzzer: 'NO_FUZZ'
toolchain: 'Clang' toolchain: 'Clang'
clang_plugins: true clang_plugins: true
- os_name: 'macOS' - os_name: 'macOS'
os: macos-15 os: macos-15
arch: 'arm64'
fuzzer: 'NO_FUZZ' fuzzer: 'NO_FUZZ'
toolchain: 'Clang' toolchain: 'Clang'
clang_plugins: false clang_plugins: false
- os_name: 'Linux' - os_name: 'Linux'
os: ubuntu-24.04 os: ubuntu-24.04
arch: 'x86_64'
fuzzer: 'FUZZ' fuzzer: 'FUZZ'
toolchain: 'Clang' toolchain: 'Clang'
clang_plugins: false clang_plugins: false
@ -44,5 +48,6 @@ jobs:
toolchain: ${{ matrix.toolchain }} toolchain: ${{ matrix.toolchain }}
os_name: ${{ matrix.os_name }} os_name: ${{ matrix.os_name }}
os: ${{ matrix.os }} os: ${{ matrix.os }}
arch: ${{ matrix.arch }}
fuzzer: ${{ matrix.fuzzer }} fuzzer: ${{ matrix.fuzzer }}
clang_plugins: ${{ matrix.clang_plugins }} clang_plugins: ${{ matrix.clang_plugins }}

9
.github/workflows/lagom-template.yml vendored
View file

@ -12,6 +12,9 @@ on:
os: os:
required: true required: true
type: string type: string
arch:
required: true
type: string
fuzzer: fuzzer:
required: false required: false
type: string type: string
@ -55,7 +58,7 @@ jobs:
uses: ./.github/actions/setup uses: ./.github/actions/setup
with: with:
os: ${{ inputs.os_name }} os: ${{ inputs.os_name }}
arch: 'Lagom' arch: ${{ inputs.arch }}
# === PREPARE FOR BUILDING === # === PREPARE FOR BUILDING ===
@ -88,7 +91,7 @@ jobs:
id: 'cache-restore' id: 'cache-restore'
with: with:
os: ${{ inputs.os_name }} os: ${{ inputs.os_name }}
arch: 'Lagom' arch: ${{ inputs.arch }}
toolchain: ${{ inputs.toolchain }} toolchain: ${{ inputs.toolchain }}
cache_key_extra: ${{ steps.build-parameters.outputs.ccache_key }} cache_key_extra: ${{ steps.build-parameters.outputs.ccache_key }}
ccache_path: ${{ env.CCACHE_DIR }} ccache_path: ${{ env.CCACHE_DIR }}
@ -173,7 +176,7 @@ jobs:
- name: Save Caches - name: Save Caches
uses: ./.github/actions/cache-save uses: ./.github/actions/cache-save
with: with:
arch: 'Lagom' arch: ${{ inputs.arch }}
ccache_path: ${{ env.CCACHE_DIR }} ccache_path: ${{ env.CCACHE_DIR }}
ccache_primary_key: ${{ steps.cache-restore.outputs.ccache_primary_key }} ccache_primary_key: ${{ steps.cache-restore.outputs.ccache_primary_key }}