Skip to content

Commit 555fbbd

Browse files
committed
fixing syntax errors with setup-godot action
1 parent b18c1e6 commit 555fbbd

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

.github/actions/setup-godot-cpp/action.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ inputs:
99
default: 4.0.11
1010
description: Emscripten version.
1111
windows-compiler:
12-
required: true
1312
description: The compiler toolchain to use on Windows ('mingw' or 'msvc').
13+
required: false
14+
default: mingw
1415
type: choice
1516
options:
1617
- mingw
1718
- msvc
18-
default: mingw
1919
mingw-version:
2020
default: 12.2.0
2121
description: MinGW version.
@@ -39,21 +39,21 @@ runs:
3939
python-version: 3.x
4040

4141
- name: Setup Android dependencies
42-
if: inputs.platform == 'android'
42+
if: ${{inputs.platform == 'android'}}
4343
uses: nttld/setup-ndk@v1
4444
with:
4545
ndk-version: ${{ inputs.ndk-version }}
4646
link-to-sdk: true
4747

4848
- name: Setup Web dependencies
49-
if: inputs.platform == 'web'
49+
if: ${{inputs.platform == 'web'}}
5050
uses: mymindstorm/setup-emsdk@v14
5151
with:
5252
version: ${{ inputs.em-version }}
5353
no-cache: true
5454

5555
- name: Setup MinGW for Windows/MinGW build
56-
if: inputs.platform == 'windows' && inputs.windows-compiler == 'mingw'
56+
if: ${{inputs.platform == 'windows' && inputs.windows-compiler == 'mingw'}}
5757
uses: egor-tensin/setup-mingw@v2
5858
with:
5959
version: ${{ inputs.mingw-version }}
@@ -68,4 +68,4 @@ runs:
6868
6969
- name: Install Ninja
7070
if: ${{ inputs.buildtool == 'cmake' }}
71-
uses: ashutoshvarma/setup-ninja@master
71+
uses: ashutoshvarma/setup-ninja@v1.1

.github/workflows/ci-cmake.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
fail-fast: false
3737
matrix:
3838
include:
39+
# Linux-gcc
3940
- name: 🐧 Linux (GCC, Makefiles)
4041
os: ubuntu-22.04
4142
platform: linux
@@ -47,6 +48,8 @@ jobs:
4748
godot-master-workflow: linux_builds.yml
4849
godot-master-artifact: linux-editor-mono
4950

51+
# Linux-clang?
52+
5053
- name: 🐧 Linux (GCC, Makefiles) for Godot 4.6
5154
os: ubuntu-22.04
5255
platform: linux
@@ -61,6 +64,7 @@ jobs:
6164
godot-master-workflow: linux_builds.yml
6265
godot-master-artifact: linux-editor-mono
6366

67+
# Windows-msvc
6468
- name: 🏁 Windows (x86_64, MSVC)
6569
os: windows-2022
6670
platform: windows
@@ -73,6 +77,7 @@ jobs:
7377
godot-master-workflow: windows_builds.yml
7478
godot-master-artifact: windows-editor
7579

80+
# Windows-mingw
7681
- name: 🏁 Windows (x86_64, MinGW, Ninja)
7782
os: windows-2022
7883
platform: windows
@@ -87,6 +92,7 @@ jobs:
8792
godot-master-workflow: windows_builds.yml
8893
godot-master-artifact: windows-editor
8994

95+
# macos
9096
- name: 🍎 macOS (universal, Makefiles)
9197
os: macos-latest
9298
platform: macos

0 commit comments

Comments
 (0)