Jasima/godot-xterm
1
0
Fork 0
mirror of https://github.com/lihop/godot-xterm.git synced 2024-11-10 04:40:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use matrix.os only for runs-on

Browse source 
Otherwise use matrix.platform.
This commit is contained in:
Leroy Hopson 2024-02-24 19:53:24 +13:00
parent aa6b447c6c
commit d223a458cd
No known key found for this signature in database
GPG key ID: D2747312A6DB51AA
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/main.yml vendored
View file

@ -108,14 +108,14 @@ jobs:
if: ${{ matrix.platform == 'web' }} if: ${{ matrix.platform == 'web' }}
run: sudo apt-get update && sudo apt-get install -y scons gcc-multilib g++-multilib run: sudo apt-get update && sudo apt-get install -y scons gcc-multilib g++-multilib
- name: Install additional macos build dependencies - name: Install additional macos build dependencies
if: ${{ matrix.os == 'macos-12' }} if: ${{ matrix.platform == 'macos' }}
run: brew install scons run: brew install scons
- name: Install additional windows build dependencies - name: Install additional windows build dependencies
if: ${{ matrix.os == 'windows-2022' }} if: ${{ matrix.platform == 'windows' }}
run: python -m pip install scons run: python -m pip install scons
- name: Setup MSVC command prompt - name: Setup MSVC command prompt
uses: ilammy/msvc-dev-cmd@v1 uses: ilammy/msvc-dev-cmd@v1
if: ${{ matrix.os == 'windows-2022' }} if: ${{ matrix.platform == 'windows' }}
with: with:
arch: win${{ matrix.bits }} arch: win${{ matrix.bits }}
- name: Setup cmake - name: Setup cmake
@ -123,14 +123,14 @@ jobs:
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.os == 'windows-2022' }} use-32bit: ${{ matrix.bits == 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 }}
TARGET: ${{ matrix.target }} TARGET: ${{ matrix.target }}
BITS: ${{ matrix.bits }} BITS: ${{ matrix.bits }}
OS: ${{ matrix.os }}
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 \
@ -140,7 +140,7 @@ jobs:
else else
args="$args -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL" args="$args -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL"
fi fi
if [ "$BITS" -eq 32 -a "$OS" == "windows-2022" ]; then if [ "$BITS" -eq 32 -a "$PLATFORM" == "windows" ]; then
cmake -G "Visual Studio 17 2022" -A Win32 -S $(pwd) -B "build" $args cmake -G "Visual Studio 17 2022" -A Win32 -S $(pwd) -B "build" $args
else else
mkdir build || true mkdir build || true