Modify matrix

This commit is contained in:
Leroy Hopson 2024-02-25 12:24:59 +13:00
parent 1514f42b54
commit f901d18052
No known key found for this signature in database
GPG key ID: D2747312A6DB51AA

View file

@ -54,12 +54,7 @@ jobs:
matrix: matrix:
platform: [web, macos, windows] platform: [web, macos, windows]
target: [release, debug] target: [release, debug]
bits: [64, 32] arch: [wasm32, universal, x86_64, x86_32]
exclude:
- platform: web
bits: 64
- platform: macos
bits: 32
include: include:
- platform: web - platform: web
os: ubuntu-22.04 os: ubuntu-22.04
@ -67,16 +62,23 @@ jobs:
os: macos-12 os: macos-12
- platform: windows - platform: windows
os: windows-2022 os: windows-2022
exclude:
- platform: web - platform: web
arch: x86_64
- platform: web
arch: x86_32
- platform: web
arch: universal
- platform: macos
arch: wasm32 arch: wasm32
- platform: macos - platform: macos
arch: universal
- platform: windows
bits: 64
arch: x86_64 arch: x86_64
- platform: windows - platform: macos
bits: 32
arch: x86_32 arch: x86_32
- platform: windows
arch: wasm32
- platform: windows
arch: universal
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
@ -117,20 +119,20 @@ jobs:
uses: ilammy/msvc-dev-cmd@v1 uses: ilammy/msvc-dev-cmd@v1
if: ${{ matrix.platform == 'windows' }} if: ${{ matrix.platform == 'windows' }}
with: with:
arch: win${{ matrix.bits }} arch: win${{ matrix.arch == 'x86_64' && '64' || '32' }}
- name: Setup cmake - name: Setup cmake
if: steps.cache-submodules.outputs.cache-hit != 'true' if: steps.cache-submodules.outputs.cache-hit != 'true'
uses: jwlawson/actions-setup-cmake@v2 uses: jwlawson/actions-setup-cmake@v2
with: with:
cmake-version: "3.23.2" cmake-version: "3.23.2"
use-32bit: ${{ matrix.bits == 32 && matrix.platform == 'windows' }} use-32bit: ${{ matrix.arch == 'x86_32' && matrix.platform == 'windows' }}
- name: Build libuv - name: Build libuv
if: steps.cache-submodules.outputs.cache-hit != 'true' if: steps.cache-submodules.outputs.cache-hit != 'true'
shell: bash shell: bash
env: env:
PLATFORM: ${{ matrix.platform }} PLATFORM: ${{ matrix.platform }}
TARGET: ${{ matrix.target }} TARGET: ${{ matrix.target }}
BITS: ${{ matrix.bits }} BITS: ${{ matrix.arch == 'x86_64' && 64 || 32 }}
run: | run: |
cd addons/godot_xterm/native/thirdparty/libuv cd addons/godot_xterm/native/thirdparty/libuv
args="-DCMAKE_BUILD_TYPE=$TARGET -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE \ args="-DCMAKE_BUILD_TYPE=$TARGET -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE \
@ -238,11 +240,17 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
platform: [linux, macos, windows] platform: [linux, macos, windows]
bits: [64, 32]
test-type: [headless, rendering, unix] test-type: [headless, rendering, unix]
arch: [x86_64, x86_32, universal]
exclude: exclude:
- platform: linux
arch: universal
- platform: macos - platform: macos
bits: 32 arch: x86_64
- platform: macos
arch: x86_32
- platform: windows
arch: universal
- platform: windows - platform: windows
test-type: rendering test-type: rendering
- platform: windows - platform: windows
@ -254,20 +262,6 @@ jobs:
os: macos-12 os: macos-12
- platform: windows - platform: windows
os: windows-2022 os: windows-2022
- platform: linux
bits: 64
arch: x86_64
- platform: linux
bits: 32
arch: x86_32
- platform: macos
arch: universal
- platform: windows
bits: 64
arch: x86_64
- platform: windows
bits: 32
arch: x86_32
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Setup Godot - name: Setup Godot