Merge branch 'master' into mbedtls3

Aidan63 · Jun 16, 2024 · 17e6116 · 17e6116
2 parents d23c320 + 8e3bc36
commit 17e6116
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tools/azure-pipelines/build.yml b/tools/azure-pipelines/build.yml
@@ -39,7 +39,7 @@ jobs:
           displayName: Install dependencies
         - script: |
             set -ex
-            sudo systemctl unmask mysql.service 
+            sudo systemctl unmask mysql.service
             sudo systemctl start mysql
             sudo mysql -u root -e "create database hxcpp; grant all privileges on hxcpp.* to hxcpp@localhost identified by 'hxcpp'; flush privileges;"
           displayName: Configure MariaDB

diff --git a/tools/hxcpp/PathManager.hx b/tools/hxcpp/PathManager.hx
@@ -106,7 +106,7 @@ class PathManager
 
          try
          {
-            output = ProcessManager.runProcess(Sys.getEnv ("HAXEPATH"), "haxelib", [ "path", name ], true, false);
+            output = ProcessManager.runProcess("", "haxelib", [ "path", name ], true, false);
          }
          catch (e:Dynamic) {}