Merge branch 'main' into develop

.github/workflows/create-release-ci.yml

@@ -171,22 +171,22 @@ jobs:
           prerelease: false
 
       - name: Publish Windows Release
-        uses: pyTooling/Actions/releaser/composite@main
+        uses: Silverlan/Releaser/releaser/composite@main
         with:
           tag: "v${{ steps.determine-version.outputs.version }}"
           rm: true
           token: ${{ secrets.GITHUB_TOKEN }}
           files: ${{ steps.windows-version.outputs.filename }}
 
       - name: Publish Linux Release
-        uses: pyTooling/Actions/releaser/composite@main
+        uses: Silverlan/Releaser/releaser/composite@main
         with:
           tag: "v${{ steps.determine-version.outputs.version }}"
           token: ${{ secrets.GITHUB_TOKEN }}
           files: ${{ steps.linux-version.outputs.filename }}
 
       - name: Publish PDB Files
-        uses: pyTooling/Actions/releaser/composite@main
+        uses: Silverlan/Releaser/releaser/composite@main
         with:
           tag: "v${{ steps.determine-version.outputs.version }}"
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pragma-linux-ci.yml

@@ -73,7 +73,7 @@ jobs:
           prerelease: true
 
       - name: Update nightly release
-        uses: pyTooling/Actions/releaser/composite@main
+        uses: Silverlan/Releaser/releaser/composite@main
         with:
           tag: nightly
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -90,6 +90,7 @@ jobs:
         shell: bash
         if: always()
         run: |
+          sudo apt install tree
           curDir=$(pwd)
 
           if [ -d "pragma/build" ]; then

.github/workflows/pragma-windows-ci.yml

@@ -86,7 +86,7 @@ jobs:
           prerelease: true
 
       - name: Update nightly release
-        uses: pyTooling/Actions/releaser/composite@main
+        uses: Silverlan/Releaser/releaser/composite@main
         with:
           tag: nightly
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -134,7 +134,7 @@ jobs:
           7z a debug_pdb.zip "$winPath/pdb/**"
 
       - name: Update PDB release
-        uses: pyTooling/Actions/releaser/composite@main
+        uses: Silverlan/Releaser/releaser/composite@main
         with:
           tag: nightly
           token: ${{ secrets.GITHUB_TOKEN }}

build_scripts/build.py

@@ -710,6 +710,7 @@ def execbuildscript(filepath):
 		l["cxx_compiler"] = cxx_compiler
 		l["no_confirm"] = no_confirm
 		l["no_sudo"] = no_sudo
+		l["no_libssl"] = no_libssl
 		l["install_system_packages"] = install_system_packages
 	#	l["harfbuzz_include_dir"] = harfbuzz_include_dir
 	#	l["harfbuzz_lib"] = harfbuzz_lib
@@ -843,7 +844,7 @@ def execbuildscript(filepath):
 if with_networking:
 	add_pragma_module(
 		name="pr_steam_networking_sockets",
-		commitSha="c76bb55fdbd736f0d3992d44f2c867a365920aa5",
+		commitSha="6919ac9a85f29f34e21257f7aaeec95710f82631",
 		repositoryUrl="https://github.com/Silverlan/pr_steam_networking_sockets.git",
 		skipBuildTarget=True
 	)

core/pragma_server/src/main.cpp

@@ -8,19 +8,16 @@
 #include "pragma/pragma_executable.hpp"
 
 int main(int argc, char *argv[])
-{
-	try {
-		std::vector<std::string> extraArgs {"-log_file", "log_server.txt"};
-		auto cargs = pragma::merge_arguments(argc, argv, extraArgs);
-		auto hModule = pragma::launch_pragma(cargs.size(), cargs.data(), true);
-		return hModule ? EXIT_SUCCESS : EXIT_FAILURE;
-	}
-	catch(const std::exception &e) //it would not work if you pass by value
-	{
-		// Note: Calling std::current_exception in a std::set_terminate handler will return NULL due to a bug in the VS libraries.
-		// Catching all unhandled exceptions here and then calling the handler works around that issue.
-		std::get_terminate()();
-	}
+try {
+	std::vector<std::string> extraArgs {"-log_file", "log_server.txt"};
+	auto cargs = pragma::merge_arguments(argc, argv, extraArgs);
+	auto hModule = pragma::launch_pragma(cargs.size(), cargs.data(), true);
+	return hModule ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+catch(...) {
+	// Note: Calling std::current_exception in a std::set_terminate handler will return NULL due to a bug in the VS libraries.
+	// Catching all unhandled exceptions here and then calling the handler works around that issue.
+	std::get_terminate()();
 }
 
 #ifdef _WIN32

github_actions/install_requirements/action.yml

@@ -12,13 +12,12 @@ runs:
       with:
         name: "pragma > install_requirements"
 
-    # This is a temporary fix for https://github.com/actions/runner-images/issues/9937
-    # We have to install libssl-dev before "apt-get update" is called, otherwise the workflow will fail
-    - name: Install libssl-dev
+    # This is a temporary fix until https://github.com/actions/runner-images/pull/9956 has been merged
+    - name: Purge needrestart
       shell: bash
       if: ${{ runner.os == 'Linux' }}
       run: |
-        sudo apt-get install libssl-dev
+        sudo apt-get purge needrestart
   
     # Required for CUDA
     - name: Set up GCC 11
@@ -43,11 +42,15 @@ runs:
         cuda: '11.7.0'
     # TODO: Install OptiX
 
+    - name: Set PIP_BREAK_SYSTEM_PACKAGES env variable
+      shell: bash
+      run: echo "PIP_BREAK_SYSTEM_PACKAGES=1" >> $GITHUB_ENV
+
     - name: Install numpy
       shell: bash
       id: install-numpy
       run: |
-        pip install numpy --break-system-packages
+        pip install numpy
   
     - name: Maximize build space
       if: runner.os == 'Linux'

tools/pfm_executable/src/main.cpp

@@ -8,7 +8,6 @@
 #include "pragma/pragma_executable.hpp"
 
 int main(int argc, char *argv[])
-{
 try {
 	std::vector<std::string> extraArgs {
 	  "-title",
@@ -26,14 +25,12 @@ try {
 	auto hModule = pragma::launch_pragma(cargs.size(), cargs.data());
 	return hModule ? EXIT_SUCCESS : EXIT_FAILURE;
 }
-catch(const std::exception &e) //it would not work if you pass by value
-{
+catch(...) {
 	// Note: Calling std::current_exception in a std::set_terminate handler will return NULL due to a bug in the VS libraries.
 	// Catching all unhandled exceptions here and then calling the handler works around that issue.
-
-	std::get_terminate();
-}
+	std::get_terminate()();
 }
+
 #ifdef _WIN32
 int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int) { return main(__argc, __argv); }
 #endif