build(UE): delete not needed inklecate binaries based on INKCPP_INKLECATE

also skip pypi release if a +UEPatch is part of the version tag

Author: JBenda

.github/workflows/build.yml

@@ -44,7 +44,7 @@ jobs:
     steps:
 
     # Checkout project
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         submodules: true
 
@@ -88,7 +88,7 @@ jobs:
       shell: bash
       run: cmake --install . --config $BUILD_TYPE --prefix comp_cl --component cl
     - name: Upload Cl
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: ${{ matrix.artifact }}-cl
         path: build/comp_cl/
@@ -98,7 +98,7 @@ jobs:
       shell: bash
       run: cmake --install . --config $BUILD_TYPE --prefix comp_lib --component lib
     - name: Upload Lib
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: ${{ matrix.artifact }}-lib
         path: build/comp_lib/
@@ -108,7 +108,7 @@ jobs:
       shell: bash
       run: cmake --install . --config $BUILD_TYPE --prefix comp_clib --component clib
     - name: Upload Clib
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: ${{matrix.artifact}}-clib
         path: build/comp_clib
@@ -118,35 +118,35 @@ jobs:
       working-directory: ${{github.workspace}}/build
       shell: bash
       run: |
-        cmake $GITHUB_WORKSPACE -DINKCPP_UNREAL_TARGET_VERSION="5.7" -DINKCPP_UNREAL=ON
+        cmake $GITHUB_WORKSPACE -DINKCPP_UNREAL_TARGET_VERSION="5.7" -DINKCPP_UNREAL=ON -DINKCPP_INKLECATE=NONE
         cmake --install . --config $BUILD_TYPE --prefix comp_unreal_5_7 --component unreal
-        cmake $GITHUB_WORKSPACE -DINKCPP_UNREAL_TARGET_VERSION="5.6" -DINKCPP_UNREAL=ON
+        cmake $GITHUB_WORKSPACE -DINKCPP_UNREAL_TARGET_VERSION="5.6" -DINKCPP_UNREAL=ON -DINKCPP_INKLECATE=NONE
         cmake --install . --config $BUILD_TYPE --prefix comp_unreal_5_6 --component unreal
-        cmake $GITHUB_WORKSPACE -DINKCPP_UNREAL_TARGET_VERSION="5.5" -DINKCPP_UNREAL=ON
+        cmake $GITHUB_WORKSPACE -DINKCPP_UNREAL_TARGET_VERSION="5.5" -DINKCPP_UNREAL=ON -DINKCPP_INKLECATE=NONE
         cmake --install . --config $BUILD_TYPE --prefix comp_unreal_5_5 --component unreal
-        cmake $GITHUB_WORKSPACE -DINKCPP_UNREAL_TARGET_VERSION="5.4" -DINKCPP_UNREAL=ON
+        cmake $GITHUB_WORKSPACE -DINKCPP_UNREAL_TARGET_VERSION="5.4" -DINKCPP_UNREAL=ON -DINKCPP_INKLECATE=NONE
         cmake --install . --config $BUILD_TYPE --prefix comp_unreal_5_4 --component unreal
     - name: Upload UE 5.7
       if: ${{ matrix.unreal }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: unreal_5_7
         path: build/comp_unreal_5_7/
     - name: Upload UE 5.6
       if: ${{ matrix.unreal }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: unreal_5_6
         path: build/comp_unreal_5_6/
     - name: Upload UE 5.5
       if: ${{ matrix.unreal }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: unreal_5_5
         path: build/comp_unreal_5_5/
     - name: Upload UE 5.4
       if: ${{ matrix.unreal }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: unreal_5_4
         path: build/comp_unreal_5_4/
@@ -183,15 +183,15 @@ jobs:
 
     # Upload results artifact
     - name: Upload Results Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: result-${{ matrix.artifact }}
         path: proofing/ink-proof/${{ matrix.artifact }}.txt
 
     # Upload website artifact
     - name: Upload Ink-Proof Website Artifact
       if: ${{ matrix.proof }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: ${{ matrix.artifact }}-www
         path: proofing/ink-proof/out
@@ -203,7 +203,7 @@ jobs:
     env:
       DOXYGEN_VERSION: "1.17.0"
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         submodules: true
     - name: Set upt Python
@@ -246,7 +246,7 @@ jobs:
       shell: bash
       run: cmake --build . --target doc --config Release
     - name: Upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: doxygen
         path: Documentation/
@@ -256,7 +256,7 @@ jobs:
     needs: compilation
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         submodules: true
     - name: Set up Python
@@ -296,7 +296,7 @@ jobs:
       run: |
         rm dist/*.whl
     - name: Upload Python files
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: python-package-distribution
         path: dist/
@@ -306,7 +306,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'master' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Fetch master branch
         run: |
           git fetch origin master
@@ -329,7 +329,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/master'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       # Download Ink Proof page for Linux
       - uses: actions/download-artifact@v4

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
       id-token: write
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Download artifacts
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -35,6 +35,7 @@ jobs:
       - name: List
         run: tree
       - name: Publish to PyPI
+        if: ${{! contains(github.ref_name, "+UEPatch")}}
         uses: pypa/gh-action-pypi-publish@release/v1.12
       - name: Create release
         env:

inkcpp/hungarian_solver.h

@@ -1,3 +1,9 @@
+/* Copyright (c) 2024 Julian Benda
+ *
+ * This file is part of inkCPP which is released under MIT license.
+ * See file LICENSE.txt or go to
+ * https://github.com/JBenda/inkcpp for full license details.
+ */
 #pragma once
 
 #include "system.h"

unreal/CMakeLists.txt

@@ -29,6 +29,7 @@ if(INKCPP_UNREAL)
 				 DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/inkcpp/Source/ThirdParty/inklecate/")
 		set(INKCPP_INKLECATE_BUNDLED TRUE)
 	else()
+		file(REMOVE_RECURSE "${CMAKE_CURRENT_BINARY_DIR}/inkcpp/Source/ThirdParty/inklecate/windows")
 		message(WARNING "InkCPP: failed to download inklecate for Windows. "
 										"A .ink file can still be imported if the user configures the inklecate path "
 										"in Project Settings > Plugins > InkCPP.")
@@ -39,6 +40,7 @@ if(INKCPP_UNREAL)
 				 DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/inkcpp/Source/ThirdParty/inklecate/")
 		set(INKCPP_INKLECATE_BUNDLED TRUE)
 	else()
+		file(REMOVE_RECURSE "${CMAKE_CURRENT_BINARY_DIR}/inkcpp/Source/ThirdParty/inklecate/mac")
 		message(WARNING "InkCPP: failed to download inklecate for macOS. "
 										"A .ink file can still be imported if the user configures the inklecate path "
 										"in Project Settings > Plugins > InkCPP.")
@@ -49,6 +51,7 @@ if(INKCPP_UNREAL)
 				 DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/inkcpp/Source/ThirdParty/inklecate/")
 		set(INKCPP_INKLECATE_BUNDLED TRUE)
 	else()
+		file(REMOVE_RECURSE "${CMAKE_CURRENT_BINARY_DIR}/inkcpp/Source/ThirdParty/inklecate/linux")
 		message(WARNING "InkCPP: failed to download inklecate for Linux. "
 										"A .ink file can still be imported if the user configures the inklecate path "
 										"in Project Settings > Plugins > InkCPP.")