mirror of
				https://git.tardis.systems/mirrors/yuzu
				synced 2025-10-31 02:34:11 +01:00 
			
		
		
		
	android: Fix regex for git version
This commit is contained in:
		
							parent
							
								
									f049453dd6
								
							
						
					
					
						commit
						0a1283f94f
					
				| @ -259,13 +259,20 @@ fun runGitCommand(command: List<String>): String { | |||||||
| } | } | ||||||
| 
 | 
 | ||||||
| fun getGitVersion(): String { | fun getGitVersion(): String { | ||||||
|     val gitVersion = runGitCommand(listOf("git", "describe", "--always", "--long")) |     val gitVersion = runGitCommand( | ||||||
|  |         listOf( | ||||||
|  |             "git", | ||||||
|  |             "describe", | ||||||
|  |             "--always", | ||||||
|  |             "--long" | ||||||
|  |         ) | ||||||
|  |     ).replace(Regex("(-0)?-[^-]+$"), "") | ||||||
|     val versionName = if (System.getenv("GITHUB_ACTIONS") != null) { |     val versionName = if (System.getenv("GITHUB_ACTIONS") != null) { | ||||||
|         System.getenv("GIT_TAG_NAME") ?: gitVersion |         System.getenv("GIT_TAG_NAME") ?: gitVersion | ||||||
|     } else { |     } else { | ||||||
|         gitVersion |         gitVersion | ||||||
|     } |     } | ||||||
|     return versionName.replace(Regex("(-0)?-[^-]+$"), "").ifEmpty { "0.0" } |     return versionName.ifEmpty { "0.0" } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| fun getGitHash(): String = | fun getGitHash(): String = | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user