forked from MapComplete/MapComplete
		
	Improve automerge script
This commit is contained in:
		
							parent
							
								
									f030e3c959
								
							
						
					
					
						commit
						7a993eb702
					
				
					 1 changed files with 3 additions and 5 deletions
				
			
		|  | @ -2,17 +2,15 @@ | |||
| 
 | ||||
| # Automerge translations automatically fetches the translations from weblate | ||||
| 
 | ||||
| git remote update weblate-github | ||||
| git merge --no-commit weblate-github/weblate-mapcomplete-layers | ||||
| git merge --no-commit weblate-github/weblate-mapcomplete-layer-translations | ||||
| git merge --no-commit weblate-github/weblate-mapcomplete-core | ||||
| git fetch weblate-github | ||||
| git merge --no-commit weblate-github/weblate-mapcomplete-layers weblate-github/weblate-mapcomplete-layer-translations weblate-github/weblate-mapcomplete-core | ||||
| 
 | ||||
| npm run generate:translations | ||||
|  if [ "$?" = "0" ]; then | ||||
|   # Translation generation went fine - commit | ||||
|   git add langs/ | ||||
|   git add assets/ | ||||
|   git commit -m "Merge weblate translations and regenerate translations" | ||||
|   git commit -m "Merge weblate trangsslations and regenerate translations" | ||||
|  else | ||||
|   echo "Generation of translations failed!" | ||||
|   git checkout HEAD | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue