Fix cache not working

ollydev · Sep 30, 2021 · 9b2cfd3 · 9b2cfd3
1 parent 3340b20
commit 9b2cfd3
Show file tree

Hide file tree

Showing 2 changed files with 154 additions and 154 deletions.
diff --git a/dist/index/index.js b/dist/index/index.js
@@ -57107,19 +57107,19 @@ const path = __nccwpck_require__(5622);
 const sha1 = __nccwpck_require__(6137);
 
 const
-  fpcup_downloads = {
-    'linux': {
-      'x86_64': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-x86_64-linux',
-      'aarch64': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-x86_64-linux'
-    },
-    'win32': {
-      'i386': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-i386-win32.exe',
-      'x86_64': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-x86_64-win64.exe'  
-    },
-    'darwin': {
-      'x86_64': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-x86_64-darwin'
+    fpcup_downloads = {
+        'linux': {
+            'x86_64': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-x86_64-linux',
+            'aarch64': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-x86_64-linux'
+        },
+        'win32': {
+            'i386': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-i386-win32.exe',
+            'x86_64': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-x86_64-win64.exe'
+        },
+        'darwin': {
+            'x86_64': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-x86_64-darwin'
+        }
     }
-  }
 
 async function bash(command_line) {
 
@@ -57132,7 +57132,7 @@ async function install_fpcup(url) {
     await bash(['chmod +x fpcup']);
 }
 
-async function restore_lazarus(key, dir) {
+async function restore_lazarus(dir, key) {
 
     var key = await cache.restoreCache([dir], key);
     if (key != null) {
@@ -57144,89 +57144,89 @@ async function restore_lazarus(key, dir) {
 
 async function install_lazarus(dir) {
 
-	var version = '';
-	if (core.getInput('fpc-branch') != '') {
-		version = '--fpcBranch="' + core.getInput('fpc-branch') + '"'; 
-	} else {
-		version = '--fpcRevision="' + core.getInput('fpc-revision') + '"'; 
-	}
+    var version = '';
+    if (core.getInput('fpc-branch') != '') {
+        version = '--fpcBranch="' + core.getInput('fpc-branch') + '"';
+    } else {
+        version = '--fpcRevision="' + core.getInput('fpc-revision') + '"';
+    }
 
     await bash(['./fpcup',
-    			'--verbose',
-                '--noconfirm',
-                '--installdir="' + dir + '"',
-                '--only="FPCGetOnly,FPC"',
-                '--fpcURL="gitlab"',
-                version
-               ]);
-               
-	var version = '';
-	if (core.getInput('laz-branch') != '') {
-		version = '--lazBranch="' + core.getInput('laz-branch') + '"'; 
-	} else {
-		version = '--lazRevision="' + core.getInput('laz-revision') + '"'; 
-	}
+        '--verbose',
+        '--noconfirm',
+        '--installdir="' + dir + '"',
+        '--only="FPCGetOnly,FPC"',
+        '--fpcURL="gitlab"',
+        version
+    ]);
+
+    var version = '';
+    if (core.getInput('laz-branch') != '') {
+        version = '--lazBranch="' + core.getInput('laz-branch') + '"';
+    } else {
+        version = '--lazRevision="' + core.getInput('laz-revision') + '"';
+    }
 
     await bash(['./fpcup',
-    			'--verbose',
-                '--noconfirm',
-                '--installdir="' + dir + '"',
-                '--only="LazarusGetOnly,LazBuildOnly"',
-                '--lazURL="gitlab"',
-                version
-               ]);
-   
-   
+        '--verbose',
+        '--noconfirm',
+        '--installdir="' + dir + '"',
+        '--only="LazarusGetOnly,LazBuildOnly"',
+        '--lazURL="gitlab"',
+        version
+    ]);
+
+
     if (core.getInput('cpu') != 'aarch64') {
-    	return;
+        return;
     }
-        
+
     console.log('Installing aarch64 cross compiler');
 
     await toolcache.extractZip(await toolcache.downloadTool('https://github.com/LongDirtyAnimAlf/fpcupdeluxe/releases/download/crosslibs_v1.1/CrossLibsLinuxAarch64.zip'), dir);
     await toolcache.extractZip(await toolcache.downloadTool('https://github.com/LongDirtyAnimAlf/fpcupdeluxe/releases/download/linuxx64crossbins_v1.0/CrossBinsLinuxAarch64.zip'), path.join(dir, 'cross/bin'));
-    
+
     await bash(['./fpcup',
-    			'--verbose',
-                '--noconfirm',    		
-                '--installdir="' + dir + '"',
-                '--ostarget=linux',
-                '--cputarget=aarch64',
-                '--only=FPCCleanOnly,FPCBuildOnly',
-                '--crossbindir="' + path.join(dir, 'cross/bin') + '"',
-                '--crosslibdir="' + path.join(dir, 'cross/lib/aarch64-linux') + '"',
-               ]);                  
+        '--verbose',
+        '--noconfirm',
+        '--installdir="' + dir + '"',
+        '--ostarget=linux',
+        '--cputarget=aarch64',
+        '--only=FPCCleanOnly,FPCBuildOnly',
+        '--crossbindir="' + path.join(dir, 'cross/bin') + '"',
+        '--crosslibdir="' + path.join(dir, 'cross/lib/aarch64-linux') + '"',
+    ]);
 }
 
 async function run() {
 
     try {
-    	if (process.platform == 'linux') {
-    		await bash(['sudo apt-get update']);
-			await bash(['sudo apt-get -m -y install libgtk2.0-dev libpango1.0-dev libxtst-dev']);
-    	}
-    	
-    	var url = core.getInput('fpcup-url');
-		if (url == '') {
-			try {
-				url = fpcup_downloads[process.platform][core.getInput('cpu')];
-			} catch {
-				throw new Error('Invalid cpu "' + core.getInput('cpu') + '" on platform "' + process.platform + '"');
-			}	
-		}
-    	
-    	var key = '[' + url + '][' + core.getInput('cpu') + '][' + core.getInput('fpc-branch') + '][' + core.getInput('fpc-revision') + '][' + core.getInput('laz-branch') + '][' + core.getInput('laz-revision') + ']';
-    	var dir = path.resolve('../laz').replace(/\\/g, "/");
-    	
-    	core.info(url);
-    	core.info(key);
-    	core.info(dir);
-    	
+        if (process.platform == 'linux') {
+            await bash(['sudo apt-get update']);
+            await bash(['sudo apt-get -m -y install libgtk2.0-dev libpango1.0-dev libxtst-dev']);
+        }
+
+        var url = core.getInput('fpcup-url');
+        if (url == '') {
+            try {
+                url = fpcup_downloads[process.platform][core.getInput('cpu')];
+            } catch {
+                throw new Error('Invalid cpu "' + core.getInput('cpu') + '" on platform "' + process.platform + '"');
+            }
+        }
+
+        var key = '[' + url + '][' + core.getInput('cpu') + '][' + core.getInput('fpc-branch') + '][' + core.getInput('fpc-revision') + '][' + core.getInput('laz-branch') + '][' + core.getInput('laz-revision') + ']';
+        var dir = path.resolve('../laz').replace(/\\/g, "/");
+
+        core.info(url);
+        core.info(key);
+        core.info(dir);
+
         if (await restore_lazarus(dir, sha1(key)) == false) {
-        
+
             await install_fpcup(url);
             await install_lazarus(dir);
-            
+
             // Pass to post.js
             core.exportVariable('SAVE_CACHE_DIR', dir);
             core.exportVariable('SAVE_CACHE_KEY', sha1(key));

diff --git a/source/main.js b/source/main.js
@@ -10,19 +10,19 @@ const path = require('path');
 const sha1 = require('sha1');
 
 const
-  fpcup_downloads = {
-    'linux': {
-      'x86_64': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-x86_64-linux',
-      'aarch64': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-x86_64-linux'
-    },
-    'win32': {
-      'i386': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-i386-win32.exe',
-      'x86_64': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-x86_64-win64.exe'  
-    },
-    'darwin': {
-      'x86_64': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-x86_64-darwin'
+    fpcup_downloads = {
+        'linux': {
+            'x86_64': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-x86_64-linux',
+            'aarch64': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-x86_64-linux'
+        },
+        'win32': {
+            'i386': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-i386-win32.exe',
+            'x86_64': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-x86_64-win64.exe'
+        },
+        'darwin': {
+            'x86_64': 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0b/fpclazup-x86_64-darwin'
+        }
     }
-  }
 
 async function bash(command_line) {
 
@@ -35,7 +35,7 @@ async function install_fpcup(url) {
     await bash(['chmod +x fpcup']);
 }
 
-async function restore_lazarus(key, dir) {
+async function restore_lazarus(dir, key) {
 
     var key = await cache.restoreCache([dir], key);
     if (key != null) {
@@ -47,89 +47,89 @@ async function restore_lazarus(key, dir) {
 
 async function install_lazarus(dir) {
 
-	var version = '';
-	if (core.getInput('fpc-branch') != '') {
-		version = '--fpcBranch="' + core.getInput('fpc-branch') + '"'; 
-	} else {
-		version = '--fpcRevision="' + core.getInput('fpc-revision') + '"'; 
-	}
+    var version = '';
+    if (core.getInput('fpc-branch') != '') {
+        version = '--fpcBranch="' + core.getInput('fpc-branch') + '"';
+    } else {
+        version = '--fpcRevision="' + core.getInput('fpc-revision') + '"';
+    }
 
     await bash(['./fpcup',
-    			'--verbose',
-                '--noconfirm',
-                '--installdir="' + dir + '"',
-                '--only="FPCGetOnly,FPC"',
-                '--fpcURL="gitlab"',
-                version
-               ]);
-               
-	var version = '';
-	if (core.getInput('laz-branch') != '') {
-		version = '--lazBranch="' + core.getInput('laz-branch') + '"'; 
-	} else {
-		version = '--lazRevision="' + core.getInput('laz-revision') + '"'; 
-	}
+        '--verbose',
+        '--noconfirm',
+        '--installdir="' + dir + '"',
+        '--only="FPCGetOnly,FPC"',
+        '--fpcURL="gitlab"',
+        version
+    ]);
+
+    var version = '';
+    if (core.getInput('laz-branch') != '') {
+        version = '--lazBranch="' + core.getInput('laz-branch') + '"';
+    } else {
+        version = '--lazRevision="' + core.getInput('laz-revision') + '"';
+    }
 
     await bash(['./fpcup',
-    			'--verbose',
-                '--noconfirm',
-                '--installdir="' + dir + '"',
-                '--only="LazarusGetOnly,LazBuildOnly"',
-                '--lazURL="gitlab"',
-                version
-               ]);
-   
-   
+        '--verbose',
+        '--noconfirm',
+        '--installdir="' + dir + '"',
+        '--only="LazarusGetOnly,LazBuildOnly"',
+        '--lazURL="gitlab"',
+        version
+    ]);
+
+
     if (core.getInput('cpu') != 'aarch64') {
-    	return;
+        return;
     }
-        
+
     console.log('Installing aarch64 cross compiler');
 
     await toolcache.extractZip(await toolcache.downloadTool('https://github.com/LongDirtyAnimAlf/fpcupdeluxe/releases/download/crosslibs_v1.1/CrossLibsLinuxAarch64.zip'), dir);
     await toolcache.extractZip(await toolcache.downloadTool('https://github.com/LongDirtyAnimAlf/fpcupdeluxe/releases/download/linuxx64crossbins_v1.0/CrossBinsLinuxAarch64.zip'), path.join(dir, 'cross/bin'));
-    
+
     await bash(['./fpcup',
-    			'--verbose',
-                '--noconfirm',    		
-                '--installdir="' + dir + '"',
-                '--ostarget=linux',
-                '--cputarget=aarch64',
-                '--only=FPCCleanOnly,FPCBuildOnly',
-                '--crossbindir="' + path.join(dir, 'cross/bin') + '"',
-                '--crosslibdir="' + path.join(dir, 'cross/lib/aarch64-linux') + '"',
-               ]);                  
+        '--verbose',
+        '--noconfirm',
+        '--installdir="' + dir + '"',
+        '--ostarget=linux',
+        '--cputarget=aarch64',
+        '--only=FPCCleanOnly,FPCBuildOnly',
+        '--crossbindir="' + path.join(dir, 'cross/bin') + '"',
+        '--crosslibdir="' + path.join(dir, 'cross/lib/aarch64-linux') + '"',
+    ]);
 }
 
 async function run() {
 
     try {
-    	if (process.platform == 'linux') {
-    		await bash(['sudo apt-get update']);
-			await bash(['sudo apt-get -m -y install libgtk2.0-dev libpango1.0-dev libxtst-dev']);
-    	}
-    	
-    	var url = core.getInput('fpcup-url');
-		if (url == '') {
-			try {
-				url = fpcup_downloads[process.platform][core.getInput('cpu')];
-			} catch {
-				throw new Error('Invalid cpu "' + core.getInput('cpu') + '" on platform "' + process.platform + '"');
-			}	
-		}
-    	
-    	var key = '[' + url + '][' + core.getInput('cpu') + '][' + core.getInput('fpc-branch') + '][' + core.getInput('fpc-revision') + '][' + core.getInput('laz-branch') + '][' + core.getInput('laz-revision') + ']';
-    	var dir = path.resolve('../laz').replace(/\\/g, "/");
-    	
-    	core.info(url);
-    	core.info(key);
-    	core.info(dir);
-    	
+        if (process.platform == 'linux') {
+            await bash(['sudo apt-get update']);
+            await bash(['sudo apt-get -m -y install libgtk2.0-dev libpango1.0-dev libxtst-dev']);
+        }
+
+        var url = core.getInput('fpcup-url');
+        if (url == '') {
+            try {
+                url = fpcup_downloads[process.platform][core.getInput('cpu')];
+            } catch {
+                throw new Error('Invalid cpu "' + core.getInput('cpu') + '" on platform "' + process.platform + '"');
+            }
+        }
+
+        var key = '[' + url + '][' + core.getInput('cpu') + '][' + core.getInput('fpc-branch') + '][' + core.getInput('fpc-revision') + '][' + core.getInput('laz-branch') + '][' + core.getInput('laz-revision') + ']';
+        var dir = path.resolve('../laz').replace(/\\/g, "/");
+
+        core.info(url);
+        core.info(key);
+        core.info(dir);
+
         if (await restore_lazarus(dir, sha1(key)) == false) {
-        
+
             await install_fpcup(url);
             await install_lazarus(dir);
-            
+
             // Pass to post.js
             core.exportVariable('SAVE_CACHE_DIR', dir);
             core.exportVariable('SAVE_CACHE_KEY', sha1(key));