fix: sp 1.12+ include path resolution (#6)

* fix: missing & outdated dependencies

* fix: sp 1.12+ include path resolution

* ci: separate ci flow for dev

.github/workflows/dev_workflow.yml

@@ -0,0 +1,27 @@
+name: Development Workflow
+
+on:
+  push:
+    branches-ignore:
+      - 'master'
+
+jobs:
+  run:
+    name: Run action
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Setup SourcePawn Compiler
+      uses: ./
+      with:
+        version: "1.12.x"
+
+    - name: Verify compiler
+      run: |
+        which spcomp
+        echo $includePath
+        ls -l $scriptingPath
+        cat $(which spcomp)
+        spcomp __tests__/compile.sp

.github/workflows/workflow.yml

@@ -1,26 +1,27 @@
 name: Main Workflow
 
-on: [push]
+on:
+  push:
+    branches:
+      - 'master'
 
 jobs:
   run:
     name: Run action
-    runs-on: ${{ matrix.operating-systems }}
-    strategy:
-      matrix:
-        operating-systems: [ubuntu-latest, windows-latest, macos-latest]
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v1
 
     - name: Setup SourcePawn Compiler
       uses: rumblefrog/setup-sp@master
       with:
-        version: "1.11.x"
+        version: "1.12.x"
 
-      # For some reason, mac compiler doesn't use the include directory in which the compiler is in
     - name: Verify compiler
       run: |
         which spcomp
         echo $includePath
-        spcomp -i$includePath __tests__/compile.sp
+        ls -l $scriptingPath
+        cat $(which spcomp)
+        spcomp __tests__/compile.sp

.gitignore

@@ -0,0 +1 @@
+node_modules

action.yml

@@ -20,7 +20,7 @@ outputs:
   version-file:
     description: 'Version of the .sp file'
 runs:
-  using: 'node12'
+  using: 'node16'
   main: 'lib/index.js'
 branding:
   icon: 'command'  

package.json

@@ -1,19 +1,20 @@
 {
   "dependencies": {
-    "@actions/core": "^1.2.6",
-    "@actions/tool-cache": "^1.1.2",
-    "@types/node": "^12.12.7",
-    "@types/semver": "^6.2.0",
-    "await-to-js": "^2.1.1",
-    "semver": "^6.3.0"
+    "@actions/core": "^1.9.0",
+    "@actions/tool-cache": "^2.0.1",
+    "@types/node": "^18.0.3",
+    "@types/semver": "^7.3.10",
+    "await-to-js": "^3.0.0",
+    "semver": "^7.3.7",
+    "typed-rest-client": "^1.8.9"
   },
   "devDependencies": {
-    "ts-loader": "^9.2.6",
-    "typescript": "^4.4.3",
-    "webpack": "^5.58.1",
-    "webpack-cli": "^4.9.0"
+    "ts-loader": "^9.3.1",
+    "typescript": "^4.7.4",
+    "webpack": "^5.73.0",
+    "webpack-cli": "^4.10.0"
   },
   "scripts": {
-    "start": "./node_modules/.bin/webpack --config ./webpack.config.js"
+    "build": "./node_modules/.bin/webpack --config ./webpack.config.js"
   }
 }

src/index.ts

@@ -1,6 +1,5 @@
 import * as core from '@actions/core';
 import { installCompiler } from './installer';
-import * as path from "path";
 import * as fs from "fs";
 import { parseFile } from "./utils/parser";
 
@@ -13,11 +12,13 @@ async function run() {
 
         const versionFile = core.getInput('version-file', { required: false });
         const defineName = core.getInput('define-name', { required: false });
+
         if(versionFile !== "") {
             if(!fs.existsSync(versionFile)) {
                 core.error("The path of the file containing the version is incorrect.");
                 return;
             }
+
             let parsedVersion = parseFile(versionFile, defineName);
             core.setOutput('plugin-version', parsedVersion);
         }

src/installer.ts

@@ -1,10 +1,14 @@
 import { find as findCache, downloadTool, extractTar, extractZip, cacheDir } from '@actions/tool-cache';
 import { addPath, exportVariable } from '@actions/core';
 import { maxSatisfying } from 'semver';
+import { existsSync } from 'fs';
+import { rename, writeFile } from 'fs/promises';
 import { join as pathJoin } from 'path';
 import { getVersions } from './utils/scraper';
+import { Version } from './structures/versioning';
 
-let versions;
+const CACHE_KEY = 'sourcepawn';
+let versions: { [x: string]: Version | { toEndpoint: () => string; }; };
 
 export async function installCompiler(range: string): Promise<string> {
     versions = await getVersions();
@@ -15,13 +19,31 @@ export async function installCompiler(range: string): Promise<string> {
         throw new Error(`Unable to find a version matching ${range}`);
     }
 
-    let cache = findCache('sourcepawn', version);
+    let cache = findCache(CACHE_KEY, version);
 
     if (!cache) {
         cache = await downloadCompiler(version);
     }
 
+    // Workaround for https://github.com/rumblefrog/setup-sp/issues/5
+    // We use a proxy script to call the original spcomp64 and include the path to the compiler
+    if (
+        process.platform == 'linux' && !existsSync(pathJoin(cache, 'spcomp64_original'))
+    ) {
+        await rename(pathJoin(cache, 'spcomp64'), pathJoin(cache, 'spcomp64_original'));
+        await rename(pathJoin(cache, 'spcomp'), pathJoin(cache, 'spcomp_original'));
+
+        const proxy_script = `
+        #!/bin/bash
+        ${pathJoin(cache, 'spcomp64_original')} -i${pathJoin(cache, 'include')} $@
+        `;
+
+        await writeFile(pathJoin(cache, 'spcomp'), proxy_script, { mode: 0o755 });
+        await writeFile(pathJoin(cache, 'spcomp64'), proxy_script, { mode: 0o755 });
+    }
+
     addPath(cache);
+    exportVariable('scriptingPath', pathJoin(cache));
     exportVariable('includePath', pathJoin(cache, 'include'));
 
     return version;
@@ -30,15 +52,15 @@ export async function installCompiler(range: string): Promise<string> {
 async function downloadCompiler(version: string) {
     const spPath = await downloadTool(versions[version].toEndpoint());
 
-    let extracted;
+    let extracted: string;
 
     if (process.platform === 'linux') {
         extracted = await extractTar(spPath);
     } else {
         extracted = await extractZip(spPath);
     }
 
-    let spRoot = pathJoin(extracted, 'addons', 'sourcemod', 'scripting');
+    const spRoot = pathJoin(extracted, 'addons', 'sourcemod', 'scripting');
 
-    return await cacheDir(spRoot, 'sourcepawn', version);
+    return await cacheDir(spRoot, CACHE_KEY, version);
 }

tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "lib": [ "es2015" ],
+    "lib": [ "es2020" ],
     "target": "es6",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
     "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
     "outDir": "./lib",                        /* Redirect output structure to the directory. */