fix: CI

bscotch · Oct 6, 2024 · cf05bd7 · cf05bd7
1 parent abb1822
commit cf05bd7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Create the settings file
         if: runner.os == 'Linux'
         run: |
-          echo '{"machine.Platform Settings.Android.Keystore.filename": "${{ github.workspace }}/ascx.keystore", "machine.Platform Settings.Android.Keystore.keystore_password": "${{ secrets.KEYSTORE_PASSWORD }}", "machine.Platform Settings.Android.Keystore.keystore_alias_password": "${{ secrets.KEYSTORE_PASSWORD }}", "machine.Platform Settings.Android.Keystore.alias": "${{ secrets.KEYSTORE_USERNAME }}"}' > local_settings.json
+          echo '{"machine.Platform Settings.Android.Keystore.filename": "${{ github.workspace }}/ascx.keystore", "machine.Platform Settings.Android.Keystore.keystore_password": "${{ secrets.KEYSTORE_PASSWORD }}", "machine.Platform Settings.Android.Keystore.keystore_alias_password": "${{ secrets.KEYSTORE_PASSWORD }}", "machine.Platform Settings.Android.Keystore.alias": "${{ secrets.KEYSTORE_USERNAME }}" , "machine.Platform Settings.Android.Paths.jdk_location": "$JAVA_HOME_17_X64" }' > local_settings.json
       - name: Set Up Android tools (Linux only)
         if: runner.os == 'Linux'
         run: |

diff --git a/src/lib/igor-build.ts b/src/lib/igor-build.ts
@@ -89,7 +89,7 @@ export class Gms2Compile {
     }
     this.baseName = basename(this.projectDir, extname(this.projectDir)).replace(
       " ",
-      "_",
+      "_"
     );
     this.exportPlatform = options.exportPlatform;
     this.destinationDir = options.destinationDir || resolve("out");
@@ -101,15 +101,15 @@ export class Gms2Compile {
     this.yyc = options.yyc;
 
     this.localSettings = fs.readJSONSync(
-      join(this.userDir, "local_settings.json"),
+      join(this.userDir, "local_settings.json")
     );
 
     this.targetRuntime = this.localSettings["targetRuntime"];
 
     this.runtimePath = //Infer the runtime path
       join(
         this.localSettings["runtimeDir"] as string,
-        `runtime-${this.targetRuntime}`,
+        `runtime-${this.targetRuntime}`
       );
   }
 
@@ -172,7 +172,7 @@ export class Gms2Compile {
     const originalBaseName = this.baseName;
     //Convert originalBaseName to replace all space and hyphen with underscore
     const baseName = originalBaseName.replace(/[-\s]/g, "_");
-    return join(buildTempDir, baseName, `baseName.xcodeproj`);
+    return join(buildTempDir, baseName, `${baseName}.xcodeproj`);
   }
 
   androidGradleOutputDir() {
@@ -193,7 +193,7 @@ export class Gms2Compile {
 
   private _generateWorkerCommands(
     platform: ModuleAliases,
-    generatePublishBuild = false,
+    generatePublishBuild = false
   ) {
     const worker = this._convertToIgorWorker(platform);
 
@@ -237,7 +237,7 @@ export class Gms2Compile {
         baseCommand = join(
           this.runtimePath,
           `bin/igor/windows/${arch}`,
-          "Igor.exe",
+          "Igor.exe"
         );
       } else if (osPlatform() == "darwin") {
         baseCommand = join(this.runtimePath, `bin/igor/osx/${arch}`, "Igor");
@@ -265,12 +265,12 @@ export class Gms2Compile {
       `/runtime=${buildOptimization}`,
       "/v",
       "/ic",
-      "/cr",
+      "/cr"
     );
 
     if (fs.existsSync(legacyIgor)) {
       args.push(
-        `/ssdk=${this.localSettings["machine.Platform Settings.Steam.steamsdk_path"]}`,
+        `/ssdk=${this.localSettings["machine.Platform Settings.Steam.steamsdk_path"]}`
       );
     }
     const igorCommand = this._generateWorkerCommands(this.exportPlatform);