Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions .github/actions/setup-runner/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,15 @@ runs:
echo "::endgroup::"

begin_group "App Python_ROOT_DIR env variable"
Python_ROOT_DIR="$RUNNER_TOOL_CACHE/Python/${{ steps.setup-python.outputs.python-version }}/${{ inputs.python-arch }}"
if [ "$RUNNER_OS" == "Windows" ]; then
Python_EXECUTABLE="$Python_ROOT_DIR/python.exe"
else
Python_EXECUTABLE="$Python_ROOT_DIR/bin/python"
fi

Python_EXECUTABLE="${{ steps.setup-python.outputs.python-path }}"
Python_ROOT_DIR=$(dirname "${Python_EXECUTABLE//\\//}")
# Python_ROOT_DIR="$RUNNER_TOOL_CACHE/Python/${{ steps.setup-python.outputs.python-version }}/${{ inputs.python-arch }}"
# if [ "$RUNNER_OS" == "Windows" ]; then
# Python_EXECUTABLE="$Python_ROOT_DIR/python.exe"
# else
# Python_EXECUTABLE="$Python_ROOT_DIR/bin/python"
# fi
echo "Python_ROOT_DIR=$Python_ROOT_DIR" >> $GITHUB_ENV
echo "Python_EXECUTABLE=$Python_EXECUTABLE" >> $GITHUB_ENV
echo "python-root-dir=$Python_ROOT_DIR" >> $GITHUB_OUTPUT
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release_mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ jobs:

# Download my patched QtIFW
mkdir QtIFW && cd QtIFW
aria2c https://github.com/jmarrec/QtIFW-fixup/releases/download/v5.0.0-dev-with-fixup/QtIFW-5.0.0-${{ matrix.arch }}.zip
xattr -r -d com.apple.quarantine ./QtIFW-5.0.0-${{ matrix.arch }}.zip
unzip QtIFW-5.0.0-${{ matrix.arch }}.zip
aria2c https://github.com/jmarrec/QtIFW-fixup/releases/download/v4.11.0-Patched/QtIFW-4.11.0-${{ matrix.arch }}.zip
xattr -r -d com.apple.quarantine ./QtIFW-4.11.0-${{ matrix.arch }}.zip
unzip QtIFW-4.11.0-${{ matrix.arch }}.zip
Comment on lines +101 to +103

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the mac failure was actually a fluke to begin with.

But I did go into (a very lenghty) endeavor where I updated my patched qtifw to be based on qtifw 4.11.0, and qt 6.9.1. https://github.com/jmarrec/QtIFW-fixup/releases/tag/v4.11.0-Patched

rm -Rf ./*.zip
chmod +x *
./installerbase --version
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/release_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,13 @@ jobs:
shell: bash
run: |
set -x
Python_EXECUTABLE="${{ steps.setup-python.outputs.python-path }}"
Python_EXECUTABLE="${Python_EXECUTABLE//\\//}"
cmake -G "Visual Studio 17 2022" -A ${{ matrix.vs-generator }} \
-DLINK_WITH_PYTHON:BOOL=ON -DPYTHON_CLI:BOOL=ON \
-DPython_REQUIRED_VERSION:STRING=${{ steps.setup-python.outputs.python-version }} \
-DPython_ROOT_DIR:PATH=$RUNNER_TOOL_CACHE/Python/${{ steps.setup-python.outputs.python-version }}/${{ matrix.python-arch }}/ \
-DPython_EXECUTABLE:FILEPATH="$Python_EXECUTABLE" \
-DPython_ROOT_DIR:PATH="$(dirname "$Python_EXECUTABLE")" \
Comment on lines +149 to +155

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Explicitly pass Python_EXECUTABLE to avoid a broken FindPython (new in cmake 4.3.0) arm64 detection on windows

passing -DPython_EXECUTABLE:FILEPATH=<...>bypasses the entire discovery phase, handing CMake a pre-validated path so _PYTHON_VALIDATE_INTERPRETER never needs to search

I fixed the issue upstream in cmake but it won't be released soon enough: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/12158

(I'm also doing forward slashes now, as I thought it could be the root cause and it's more correct for cmake)

-DBUILD_FORTRAN:BOOL=ON -DBUILD_PACKAGE:BOOL=ON \
-DENABLE_HARDENED_RUNTIME:BOOL=${{ matrix.enable_hardened_runtime }} \
-DDOCUMENTATION_BUILD:STRING="BuildWithAll" -DTEX_INTERACTION:STRING="batchmode" \
Expand Down
Loading