From 9416ce931a5fbffd10521e6fe396ade61dc5244a Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Mon, 18 Aug 2025 14:56:52 +1200 Subject: [PATCH 1/4] Ensure that `.gitignore` doesn't get deleted on Windows when calling our `cleanall.bat` script. --- scripts/genericclean.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/genericclean.bat b/scripts/genericclean.bat index 4199e46a4..901a6347d 100644 --- a/scripts/genericclean.bat +++ b/scripts/genericclean.bat @@ -20,7 +20,7 @@ IF "%1" == "all" ( CD !AppDir!prebuilt FOR /D %%I IN (*.*) DO RMDIR /S /Q %%I - FOR %%I IN (*.*) DO IF NOT %%I == ".gitignore" DEL /Q %%I + FOR %%I IN (*.*) DO IF NOT "%%I" == ".gitignore" DEL /Q "%%I" ) ) From 311119414f6ddbf6192fa89bb424df2924fdcbd1 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Mon, 18 Aug 2025 11:22:36 +1200 Subject: [PATCH 2/4] GHA: ninja has been fixed, so can once again use its latest version. --- .github/workflows/buildThirdPartyLibrary.yml | 4 ---- .github/workflows/cd.yml | 4 ---- .github/workflows/ci.yml | 4 ---- 3 files changed, 12 deletions(-) diff --git a/.github/workflows/buildThirdPartyLibrary.yml b/.github/workflows/buildThirdPartyLibrary.yml index f6c6c60d7..0005dc0f7 100644 --- a/.github/workflows/buildThirdPartyLibrary.yml +++ b/.github/workflows/buildThirdPartyLibrary.yml @@ -63,10 +63,6 @@ jobs: uses: actions/checkout@v4 - name: Install CMake and Ninja uses: lukka/get-cmake@latest - with: - ninjaVersion: 1.12.1 - # Note: use version 1.12.1 since version 1.13+ results in an error message on Ubuntu 22.04 LTS ARM: - # ninja: /lib/aarch64-linux-gnu/libc.so.6: version `GLIBC_2.38' not found (required by ninja) - name: Install buildcache uses: opencor/buildcache-action@v1 with: diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 30aa51a51..2f3f884c9 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -93,10 +93,6 @@ jobs: uses: actions/checkout@v4 - name: Install CMake and Ninja uses: lukka/get-cmake@latest - with: - ninjaVersion: 1.12.1 - # Note: use version 1.12.1 since version 1.13+ results in an error message on Ubuntu 22.04 LTS ARM: - # ninja: /lib/aarch64-linux-gnu/libc.so.6: version `GLIBC_2.38' not found (required by ninja) - name: Install buildcache uses: opencor/buildcache-action@v1 with: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f740812c9..92b9acd08 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -344,10 +344,6 @@ jobs: python-version: '3.11' - name: Install CMake and Ninja uses: lukka/get-cmake@latest - with: - ninjaVersion: 1.12.1 - # Note: use version 1.12.1 since version 1.13+ results in an error message on Ubuntu 22.04 LTS ARM: - # ninja: /lib/aarch64-linux-gnu/libc.so.6: version `GLIBC_2.38' not found (required by ninja) - name: Install buildcache uses: opencor/buildcache-action@v1 with: From c9a9932880d22dd924a0ce051056b3af7ebaef4d Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Mon, 18 Aug 2025 11:45:45 +1200 Subject: [PATCH 3/4] pyproject.toml: don't specify version requirements for scikit-build. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3e4dd74aa..ca0b578a5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ requires = [ 'setuptools', 'wheel', - 'scikit-build>=0.12', + 'scikit-build', 'cmake', 'ninja', ] From b44ac076f16b305285dd91167d47401f5d6a3594 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Mon, 18 Aug 2025 17:28:08 +1200 Subject: [PATCH 4/4] pyproject.toml: removed the need for `ninja`. For some reasons, it may result in the build failing on Windows. Some object files are needed for a linking step, but those object files have not yet been compiled! --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ca0b578a5..a12b9a9a2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,6 @@ requires = [ 'wheel', 'scikit-build', 'cmake', - 'ninja', ] build-backend = 'setuptools.build_meta'