From 1b4f795ca4bace12b6b3c75d3855a80a60d9fc3f Mon Sep 17 00:00:00 2001
From: Dregu <dregu@dreg.us>
Date: Sun, 22 Oct 2023 12:10:16 +0300
Subject: [PATCH] temp fix for broken workflow?, update sol2, lua

---
 .github/workflows/build.yml                 | 5 +++++
 .github/workflows/continous_integration.yml | 5 +++++
 .github/workflows/whip-build.yml            | 5 +++++
 src/CMakeLists.txt                          | 4 ++--
 src/sol2                                    | 2 +-
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c7445f059..ecc55257e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,6 +16,11 @@ jobs:
           fetch-depth: 1
           submodules: true
 
+      - name: Remove Strawberry Perl from PATH
+        run: |
+          $env:PATH = $env:PATH -replace "C:\\Strawberry\\c\\bin;", ""
+          "PATH=$env:PATH" | Out-File -FilePath $env:GITHUB_ENV -Append
+
       - name: Get tags for release notes
         shell: bash
         run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
diff --git a/.github/workflows/continous_integration.yml b/.github/workflows/continous_integration.yml
index ed24325bb..a6cdb4017 100644
--- a/.github/workflows/continous_integration.yml
+++ b/.github/workflows/continous_integration.yml
@@ -33,6 +33,11 @@ jobs:
           fetch-depth: 1
           submodules: true
 
+      - name: Remove Strawberry Perl from PATH
+        run: |
+          $env:PATH = $env:PATH -replace "C:\\Strawberry\\c\\bin;", ""
+          "PATH=$env:PATH" | Out-File -FilePath $env:GITHUB_ENV -Append
+
       - name: Configure
         run: |
           mkdir build
diff --git a/.github/workflows/whip-build.yml b/.github/workflows/whip-build.yml
index 6616b9a98..a597a5310 100644
--- a/.github/workflows/whip-build.yml
+++ b/.github/workflows/whip-build.yml
@@ -18,6 +18,11 @@ jobs:
           fetch-depth: 1
           submodules: true
 
+      - name: Remove Strawberry Perl from PATH
+        run: |
+          $env:PATH = $env:PATH -replace "C:\\Strawberry\\c\\bin;", ""
+          "PATH=$env:PATH" | Out-File -FilePath $env:GITHUB_ENV -Append
+
       - name: Get tags for release notes
         shell: bash
         run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 50cf945ea..aa84f70d3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,8 +20,8 @@ target_include_directories(imgui PUBLIC imgui)
 # --------------------------------------------------
 # sol
 set(BUILD_LUA_AS_DLL OFF)
-set(SOL2_LUA_VERSION "5.4")
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/sol2/cmake/Modules")
+set(SOL2_LUA_VERSION "5.4.6")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/sol2/cmake/Modules;${CMAKE_CURRENT_SOURCE_DIR}/sol2/cmake/Packages;${CMAKE_CURRENT_SOURCE_DIR}/sol2/cmake/Includes")
 find_package(LuaBuild REQUIRED COMPONENTS ${SOL2_LUA_VERSION})
 add_subdirectory(sol2)
 
diff --git a/src/sol2 b/src/sol2
index c068aefbe..eba86625b 160000
--- a/src/sol2
+++ b/src/sol2
@@ -1 +1 @@
-Subproject commit c068aefbeddb3dd1f1fd38d42843ecb49a3b4cdb
+Subproject commit eba86625b707e3c8c99bbfc4624e51f42dc9e561