mirror of
				https://github.com/JonasKruckenberg/tauri-build.git
				synced 2025-10-31 20:33:55 +00:00 
			
		
		
		
	fmt & lint
This commit is contained in:
		
							parent
							
								
									03f6c112bc
								
							
						
					
					
						commit
						7d1705fc00
					
				| @ -1,5 +1,5 @@ | |||||||
| { | { | ||||||
|     "plugins": ["jest", "@typescript-eslint"], |     "plugins": ["@typescript-eslint"], | ||||||
|     "extends": ["plugin:github/recommended"], |     "extends": ["plugin:github/recommended"], | ||||||
|     "parser": "@typescript-eslint/parser", |     "parser": "@typescript-eslint/parser", | ||||||
|     "parserOptions": { |     "parserOptions": { | ||||||
| @ -49,7 +49,6 @@ | |||||||
|     }, |     }, | ||||||
|     "env": { |     "env": { | ||||||
|       "node": true, |       "node": true, | ||||||
|       "es6": true, |       "es6": true | ||||||
|       "jest/globals": true |  | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| @ -1,5 +1,5 @@ | |||||||
| import {run} from '@tauri-apps/cli' | import {run} from '@tauri-apps/cli' | ||||||
| import {basename, dirname, join, posix, resolve, sep} from 'path' | import {basename, dirname, join, resolve} from 'path' | ||||||
| import glob from 'tiny-glob' | import glob from 'tiny-glob' | ||||||
| import * as core from '@actions/core' | import * as core from '@actions/core' | ||||||
| import { | import { | ||||||
| @ -19,7 +19,7 @@ interface BuildOptions { | |||||||
| } | } | ||||||
| 
 | 
 | ||||||
| export async function buildProject(options: BuildOptions): Promise<string[]> { | export async function buildProject(options: BuildOptions): Promise<string[]> { | ||||||
|   let args: string[] = options.args || [] |   const args: string[] = options.args || [] | ||||||
| 
 | 
 | ||||||
|   if (options.configPath) { |   if (options.configPath) { | ||||||
|     args.push('--config', options.configPath) |     args.push('--config', options.configPath) | ||||||
| @ -43,8 +43,14 @@ export async function buildProject(options: BuildOptions): Promise<string[]> { | |||||||
|     await run(['build', ...args], '') |     await run(['build', ...args], '') | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   const crateDir = await glob(`./**/Cargo.toml`).then(([manifest]) => join(process.cwd(), dirname(manifest))) |   const crateDir = await glob(`./**/Cargo.toml`).then(([manifest]) => | ||||||
|   const metaRaw = await execCmd('cargo', ['metadata', '--no-deps', '--format-version', '1'], { cwd: crateDir }) |     join(process.cwd(), dirname(manifest)) | ||||||
|  |   ) | ||||||
|  |   const metaRaw = await execCmd( | ||||||
|  |     'cargo', | ||||||
|  |     ['metadata', '--no-deps', '--format-version', '1'], | ||||||
|  |     {cwd: crateDir} | ||||||
|  |   ) | ||||||
|   const meta = JSON.parse(metaRaw) |   const meta = JSON.parse(metaRaw) | ||||||
|   const targetDir = meta.target_directory |   const targetDir = meta.target_directory | ||||||
| 
 | 
 | ||||||
| @ -62,20 +68,38 @@ export async function buildProject(options: BuildOptions): Promise<string[]> { | |||||||
|   ] |   ] | ||||||
|   const windowsExts = ['msi', 'msi.zip', 'msi.zip.sig'] |   const windowsExts = ['msi', 'msi.zip', 'msi.zip.sig'] | ||||||
| 
 | 
 | ||||||
|   const artifactsLookupPattern = `${bundleDir}/*/!(linuxdeploy)*.{${[...macOSExts, linuxExts, windowsExts].join(',')}}` |   const artifactsLookupPattern = `${bundleDir}/*/!(linuxdeploy)*.{${[ | ||||||
|  |     ...macOSExts, | ||||||
|  |     linuxExts, | ||||||
|  |     windowsExts | ||||||
|  |   ].join(',')}}` | ||||||
| 
 | 
 | ||||||
|   core.debug(`Looking for artifacts using this pattern: ${artifactsLookupPattern}`) |   core.debug( | ||||||
|  |     `Looking for artifacts using this pattern: ${artifactsLookupPattern}` | ||||||
|  |   ) | ||||||
| 
 | 
 | ||||||
|   const artifacts = await glob(artifactsLookupPattern, { absolute: true, filesOnly: false }) |   const artifacts = await glob(artifactsLookupPattern, { | ||||||
|  |     absolute: true, | ||||||
|  |     filesOnly: false | ||||||
|  |   }) | ||||||
| 
 | 
 | ||||||
|   let i = 0; |   let i = 0 | ||||||
|   for (const artifact of artifacts) { |   for (const artifact of artifacts) { | ||||||
|     if (artifact.endsWith('.app') && !artifacts.some(a => a.endsWith('.app.tar.gz'))) { |     if ( | ||||||
|       await execCmd('tar', ['czf', `${artifact}.tar.gz`, '-C', dirname(artifact), basename(artifact)]) |       artifact.endsWith('.app') && | ||||||
|  |       !artifacts.some(a => a.endsWith('.app.tar.gz')) | ||||||
|  |     ) { | ||||||
|  |       await execCmd('tar', [ | ||||||
|  |         'czf', | ||||||
|  |         `${artifact}.tar.gz`, | ||||||
|  |         '-C', | ||||||
|  |         dirname(artifact), | ||||||
|  |         basename(artifact) | ||||||
|  |       ]) | ||||||
|       artifacts[i] += '.tar.gz' |       artifacts[i] += '.tar.gz' | ||||||
|     } else if (artifact.endsWith('.app')) { |     } else if (artifact.endsWith('.app')) { | ||||||
|       // we can't upload a directory
 |       // we can't upload a directory
 | ||||||
|       artifacts.splice(i, 1); |       artifacts.splice(i, 1) | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     i++ |     i++ | ||||||
| @ -88,9 +112,13 @@ async function spawnCmd( | |||||||
|   cmd: string, |   cmd: string, | ||||||
|   args: string[], |   args: string[], | ||||||
|   options: SpawnOptionsWithoutStdio = {} |   options: SpawnOptionsWithoutStdio = {} | ||||||
| ) { | ): Promise<void> { | ||||||
|   return new Promise((resolve, reject) => { |   return new Promise((resolve, reject) => { | ||||||
|     const child = spawn(cmd, args, {...options, stdio: ['pipe', 'inherit', 'inherit'], shell: true}) |     const child = spawn(cmd, args, { | ||||||
|  |       ...options, | ||||||
|  |       stdio: ['pipe', 'inherit', 'inherit'], | ||||||
|  |       shell: true | ||||||
|  |     }) | ||||||
| 
 | 
 | ||||||
|     child.on('exit', () => resolve) |     child.on('exit', () => resolve) | ||||||
| 
 | 
 | ||||||
| @ -117,7 +145,11 @@ async function execCmd( | |||||||
|       {...options, encoding: 'utf-8'}, |       {...options, encoding: 'utf-8'}, | ||||||
|       (error, stdout, stderr) => { |       (error, stdout, stderr) => { | ||||||
|         if (error) { |         if (error) { | ||||||
|           console.error(`Failed to execute cmd ${cmd} with args: ${args.join(' ')}. reason: ${error}`); |           console.error( | ||||||
|  |             `Failed to execute cmd ${cmd} with args: ${args.join( | ||||||
|  |               ' ' | ||||||
|  |             )}. reason: ${error}` | ||||||
|  |           ) | ||||||
|           reject(stderr) |           reject(stderr) | ||||||
|         } else { |         } else { | ||||||
|           resolve(stdout) |           resolve(stdout) | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| import * as core from '@actions/core' | import * as core from '@actions/core' | ||||||
| import {buildProject} from './build-project' | import {buildProject} from './build-project' | ||||||
| import stringArgv from 'string-argv'; | import stringArgv from 'string-argv' | ||||||
| 
 | 
 | ||||||
| async function run(): Promise<void> { | async function run(): Promise<void> { | ||||||
|   try { |   try { | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user