[CI] Another try to make Ninja alive [6]...

DronCode · Jan 21, 2024 · c8e2850 · c8e2850
1 parent afbe457
commit c8e2850
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -45,11 +45,13 @@ jobs:
         with:
           key: "${{ runner.os }}-build-llvmorg-16.0.4"
           path: |
-            llvm_repo/build/MinSizeRel
-            llvm_repo/llvm/include
-            llvm_repo/clang/include
-            llvm_repo/clang-tools-extra/include
             llvm_repo/cmake
+            llvm_repo/build/cmake
+            llvm_repo/build/MinSizeRel
+            llvm_repo/build/include
+            llvm_repo/build/lib
+            llvm_repo/llvm
+            llvm_repo/clang
 
       # Checkout & Build LLVM 16.0.4 (Need check cache here. On cache miss - build from scratch!)
       - name: Checkout LLVM
@@ -72,29 +74,29 @@ jobs:
           cmake --build . --config MinSizeRel
 
       # Build our project. TODO: Add support of Ninja build system!!!
-      - name: Build RG3
-        env:
-          LLVM_DIR: ${{ github.workspace }}/llvm_repo/build/lib/cmake/llvm
-          CLANG_DIR: ${{ github.workspace }}/llvm_repo/build/lib/cmake/clang
-          BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
-        run: |
-          mkdir build
-          cmake -DCMAKE_BUILD_TYPE="MinSizeRel" -B build -G "Visual Studio 17 2022"
-          cd build
-          cmake --build . --config MinSizeRel
+#      - name: Build RG3
+#        env:
+#          LLVM_DIR: ${{ github.workspace }}/llvm_repo/build/lib/cmake/llvm
+#          CLANG_DIR: ${{ github.workspace }}/llvm_repo/build/lib/cmake/clang
+#          BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
+#        run: |
+#          mkdir build
+#          cmake -DCMAKE_BUILD_TYPE="MinSizeRel" -B build -G "Visual Studio 17 2022"
+#          cd build
+#          cmake --build . --config MinSizeRel
 
       # Make python packages (whl)
 
       # Make dist folder with pyd & pyi files.
-      - name: Create distribution package
-        run: |
-          mkdir dist
-          mv PyBind/rg3py.pyi dist
-          mv build/PyBind/rg3py.pyd dist
+#      - name: Create distribution package
+#        run: |
+#          mkdir dist
+#          mv PyBind/rg3py.pyi dist
+#          mv build/PyBind/MinSizeRel/rg3py.pyd dist
 
       # Upload artifacts. TODO: Upload whl artifacts too!
-      - name: Upload RG3 artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: "RG3"
-          path: dist
+#      - name: Upload RG3 artifacts
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: "RG3"
+#          path: dist
diff --git a/PyBind/CMakeLists.txt b/PyBind/CMakeLists.txt
@@ -3,7 +3,7 @@ project(RG3_PyBind)
 set(Boost_USE_STATIC_LIBS ON)
 
 # ------- LLVM BACKEND
-find_package(PythonLibs 3.10 REQUIRED)
+find_package(PythonLibs 3.10...3.99 REQUIRED)   # 3.99 to support all 3.x Python versions (dev based on 3.10)
 find_package(Boost COMPONENTS python filesystem REQUIRED)
 
 # ------- RG3 PyBind frontend