mirror of
				https://github.com/SquidDev-CC/CC-Tweaked
				synced 2025-10-30 21:23:00 +00:00 
			
		
		
		
	Update project paths in our utility build scripts
This commit is contained in:
		
							
								
								
									
										4
									
								
								.gitattributes
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.gitattributes
									
									
									
									
										vendored
									
									
								
							| @@ -1,6 +1,6 @@ | ||||
| # Ignore changes in generated files | ||||
| src/generated/** linguist-generated | ||||
| src/testMod/server-files/structures linguist-generated | ||||
| projects/*/src/generated/** linguist-generated | ||||
| projects/common/src/testMod/resources/data/cctest/structures/* linguist-generated | ||||
|  | ||||
| * text=auto | ||||
|  | ||||
|   | ||||
							
								
								
									
										2
									
								
								.github/workflows/main-ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/main-ci.yml
									
									
									
									
										vendored
									
									
								
							| @@ -37,7 +37,7 @@ jobs: | ||||
|       uses: actions/upload-artifact@v2 | ||||
|       with: | ||||
|         name: CC-Tweaked | ||||
|         path: build/libs | ||||
|         path: projects/forge/build/libs | ||||
|  | ||||
|     - name: Upload coverage | ||||
|       uses: codecov/codecov-action@v2 | ||||
|   | ||||
| @@ -397,4 +397,4 @@ | ||||
|       "count": 1 | ||||
|     } | ||||
|   } | ||||
| } | ||||
| } | ||||
|   | ||||
| @@ -10,10 +10,11 @@ Note, this is not intended to be a fool-proof tool, rather a quick way to | ||||
| ensure language files are mostly correct. | ||||
| """ | ||||
|  | ||||
| import pathlib, sys, json | ||||
| import json | ||||
| import pathlib | ||||
| from collections import OrderedDict | ||||
|  | ||||
| root = pathlib.Path("src/main/resources/assets/computercraft/lang") | ||||
| root = pathlib.Path("projects/common/src/main/resources/assets/computercraft/lang") | ||||
|  | ||||
| with (root / "en_us.json").open(encoding="utf-8") as file: | ||||
|     en_us = json.load(file, object_hook=OrderedDict) | ||||
|   | ||||
| @@ -6,12 +6,11 @@ See https://github.com/actions/toolkit/blob/master/docs/problem-matchers.md and | ||||
| https://github.com/actions/toolkit/blob/master/docs/commands.md. | ||||
| """ | ||||
|  | ||||
| from typing import Optional, Tuple | ||||
| import pathlib | ||||
| import xml.etree.ElementTree as ET | ||||
| import re | ||||
| import os.path | ||||
|  | ||||
| import pathlib | ||||
| import re | ||||
| import xml.etree.ElementTree as ET | ||||
| from typing import Optional, Tuple | ||||
|  | ||||
| LUA_ERROR_LOCATION = re.compile(r"^\s+(/[\w./-]+):(\d+):", re.MULTILINE) | ||||
| JAVA_LUA_ERROR_LOCATION = re.compile(r"^java.lang.IllegalStateException: (/[\w./-]+):(\d+):") | ||||
| @@ -28,12 +27,12 @@ SOURCE_LOCATIONS = [ | ||||
| ] | ||||
|  | ||||
| PROJECT_LOCATIONS = [ | ||||
|     ".", | ||||
|     "projects/core-api", | ||||
|     "projects/core", | ||||
|     "projects/common", | ||||
|     "projects/common-api", | ||||
|     "projects/common", | ||||
|     "projects/forge-api", | ||||
|     "projects/forge", | ||||
| ] | ||||
|  | ||||
| TEST_REPORTS = [] | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Jonathan Coates
					Jonathan Coates