Skip to content

Commit aa88bf2

Browse files
committed
Fix meson setup in CI
1 parent 00053aa commit aa88bf2

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

.github/workflows/build.yml

+12-10
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ jobs:
110110
$GODOT_BIN --headless --dump-gdextension-interface
111111
popd && popd
112112
113-
echo "EXTRA_MESON_SETUP_ARGS='-D gdextension_path=$GDEXTENSION_DIR'" >> $GITHUB_OUTPUT
114-
echo "EXTRA_RUN_TESTS_ARGS='--godot-binary=$GODOT_BIN'" >> $GITHUB_OUTPUT
113+
echo "EXTRA_MESON_SETUP_ARGS=-D gdextension_path=$GDEXTENSION_DIR" >> $GITHUB_OUTPUT
114+
echo "EXTRA_RUN_TESTS_ARGS=--godot-binary=$GODOT_BIN" >> $GITHUB_OUTPUT
115115
116116
- name: 'Setup project'
117117
run: python .github/scripts/meson_setup_or_dump_log.py build/ ${{ steps.setup-godot.outputs.EXTRA_MESON_SETUP_ARGS }}
@@ -121,7 +121,7 @@ jobs:
121121
- name: 'Run tests'
122122
run: |
123123
set -eux
124-
ARGS=--build-dir=build/ ${{ steps.setup-godot.outputs.EXTRA_RUN_TESTS_ARGS }} -- --headless
124+
ARGS="--build-dir=build/ ${{ steps.setup-godot.outputs.EXTRA_RUN_TESTS_ARGS }} -- --headless"
125125
python tests/run.py 0-gdscript $ARGS
126126
python tests/run.py 1-gdextension $ARGS
127127
python tests/run.py 2-pythonscript-init $ARGS
@@ -190,21 +190,23 @@ jobs:
190190
run: |
191191
set -eux
192192
193-
GODOT_BIN=`pwd`/godot-artifacts/godot.windows.editor.x86_64.mono
194-
GDEXTENSION_DIR=`pwd`/gdextension_api
193+
# Absolute path should be used here, but Windows's path shenanigans
194+
# prevent me from doing this :'(
195+
GODOT_BIN=./godot-artifacts/godot.windows.editor.x86_64.exe
196+
GDEXTENSION_DIR=./gdextension_api
195197
ls godot-artifacts
196198
197199
chmod +x $GODOT_BIN
198200
$GODOT_BIN --headless --version
199201
200202
mkdir $GDEXTENSION_DIR && pushd $GDEXTENSION_DIR
201-
$GODOT_BIN --headless --dump-extension-api
203+
../$GODOT_BIN --headless --dump-extension-api
202204
mkdir godot && pushd godot
203-
$GODOT_BIN --headless --dump-gdextension-interface
205+
../../$GODOT_BIN --headless --dump-gdextension-interface
204206
popd && popd
205207
206-
echo "EXTRA_MESON_SETUP_ARGS='-D gdextension_path=$GDEXTENSION_DIR'" >> $GITHUB_OUTPUT
207-
echo "EXTRA_RUN_TESTS_ARGS='--godot-binary=$GODOT_BIN'" >> $GITHUB_OUTPUT
208+
echo "EXTRA_MESON_SETUP_ARGS=-D gdextension_path=$GDEXTENSION_DIR" >> $GITHUB_OUTPUT
209+
echo "EXTRA_RUN_TESTS_ARGS=--godot-binary=$GODOT_BIN" >> $GITHUB_OUTPUT
208210
209211
- name: 'Setup project'
210212
run: python .github/scripts/meson_setup_or_dump_log.py build/ ${{ steps.setup-godot.outputs.EXTRA_MESON_SETUP_ARGS }}
@@ -216,7 +218,7 @@ jobs:
216218
shell: bash
217219
run: |
218220
set -eux
219-
ARGS=--build-dir=build/ ${{ steps.setup-godot.outputs.EXTRA_RUN_TESTS_ARGS }} -- --headless
221+
ARGS="--build-dir=build/ ${{ steps.setup-godot.outputs.EXTRA_RUN_TESTS_ARGS }} -- --headless"
220222
python tests/run.py 0-gdscript $ARGS
221223
python tests/run.py 1-gdextension $ARGS
222224
python tests/run.py 2-pythonscript-init $ARGS

0 commit comments

Comments
 (0)