Skip to content

Commit 51795d6

Browse files
committed
ci: Update workflow to run generator outside of source directory
This allows checking that the fix integrated in the previous commit effectively works. Since by default the generator output the generated files in the parent directory, the output directory is explicitly specified to be the current directory.
1 parent de5c873 commit 51795d6

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ jobs:
7373
# workaround to allow to find the Qt include dirs for installed standard qt packages
7474
mkdir /usr/include/qt5; ln -s /usr/include/x86_64-linux-gnu/qt5 /usr/include/qt5/include
7575
export QTDIR=/usr/include/qt5
76-
cd generator
7776
UBSAN_OPTIONS="halt_on_error=1" ASAN_OPTIONS="detect_leaks=0:detect_stack_use_after_return=1:fast_unwind_on_malloc=0" \
78-
./pythonqt_generator
77+
./generator/pythonqt_generator \
78+
--output-directory=.
7979
8080
- name: Build PythonQt (exclude_generator)
8181
run: |
@@ -169,10 +169,11 @@ jobs:
169169
- name: Generate Wrappers
170170
run: |
171171
export QTDIR=/usr/include/qt5
172-
cd generator
173172
# Specify "/usr/include" so that header "bits/wordsize.h" included from "qconfig.h" is found.
174173
# See https://git.rockylinux.org/staging/rpms/qt5-qtbase/-/blob/r8/SOURCES/qconfig-multilib.h
175-
./pythonqt_generator --include-paths=/usr/include
174+
./generator/pythonqt_generator \
175+
--include-paths=/usr/include \
176+
--output-directory=.
176177
177178
- name: Build PythonQt (exclude_generator)
178179
run: |
@@ -270,9 +271,9 @@ jobs:
270271
271272
- name: Generate Wrappers
272273
run: |
273-
cd generator
274274
UBSAN_OPTIONS="halt_on_error=1" ASAN_OPTIONS="detect_leaks=0:detect_stack_use_after_return=1:fast_unwind_on_malloc=0" \
275-
./pythonqt_generator
275+
./generator/pythonqt_generator \
276+
--output-directory=.
276277
277278
- name: Build PythonQt (exclude_generator)
278279
run: |
@@ -397,9 +398,9 @@ jobs:
397398
- name: Generate Wrappers
398399
shell: cmd
399400
run: |
400-
cd generator
401401
set QTDIR=%QT_ROOT_DIR%
402-
pythonqt_generator
402+
generator\pythonqt_generator ^
403+
--output-directory=.
403404
404405
- name: Build PythonQt (exclude_generator)
405406
shell: cmd

.github/workflows/build_latest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ jobs:
8585
- name: Generate Wrappers
8686
shell: bash
8787
run: |
88-
cd generator
8988
QTDIR="$QT_ROOT_DIR" \
9089
UBSAN_OPTIONS="halt_on_error=1" \
9190
ASAN_OPTIONS="detect_leaks=0:detect_stack_use_after_return=1:fast_unwind_on_malloc=0" \
92-
./pythonqt_generator
91+
./generator/pythonqt_generator \
92+
--output-directory=.
9393
9494
- name: Upload Wrappers
9595
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)