devops: strictly configure build folder for Firefox builds (#1454)
This strictly defines Firefox build folder as `obj-build-playwright`. Currently, Firefox build folder encodes current Mac OS version including patch versions, and thus we might end up with multiple different build folders.
This commit is contained in:
		
							parent
							
								
									c539325615
								
							
						
					
					
						commit
						21630d6de4
					
				|  | @ -32,11 +32,7 @@ trap "cd $(pwd -P)" EXIT | |||
| cd "$(dirname $0)" | ||||
| cd checkout | ||||
| 
 | ||||
| OBJ_FOLDER=$(ls -1 | grep obj-) | ||||
| if [[ $OBJ_FOLDER == "" ]]; then | ||||
|   echo "ERROR: cannot find obj-* folder in the checkout/. Did you build?" | ||||
|   exit 1; | ||||
| fi | ||||
| OBJ_FOLDER="obj-build-playwright" | ||||
| 
 | ||||
| ./mach package | ||||
| node ../install-preferences.js $PWD/$OBJ_FOLDER/dist/firefox | ||||
|  |  | |||
|  | @ -36,12 +36,14 @@ else | |||
|   exit 1; | ||||
| fi | ||||
| 
 | ||||
| OBJ_FOLDER="obj-build-playwright" | ||||
| echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/${OBJ_FOLDER}" >> .mozconfig | ||||
| 
 | ||||
| ./mach build | ||||
| 
 | ||||
| OBJ_FOLDER=$(ls -1 | grep obj-) | ||||
| if [[ "$(uname)" == "Darwin" ]]; then | ||||
|   node ../install-preferences.js $PWD/$OBJ_FOLDER/dist | ||||
|   node ../install-preferences.js $PWD/${OBJ_FOLDER}/dist | ||||
| else | ||||
|   node ../install-preferences.js $PWD/$OBJ_FOLDER/dist/bin | ||||
|   node ../install-preferences.js $PWD/${OBJ_FOLDER}/dist/bin | ||||
| fi | ||||
| 
 | ||||
|  |  | |||
|  | @ -6,7 +6,7 @@ trap "cd $(pwd -P)" EXIT | |||
| cd "$(dirname $0)" | ||||
| cd "checkout" | ||||
| 
 | ||||
| OBJ_FOLDER=$(ls -1 | grep obj- || true) | ||||
| OBJ_FOLDER="obj-build-playwright" | ||||
| if [[ -d $OBJ_FOLDER ]]; then | ||||
|   rm -rf $OBJ_FOLDER | ||||
| fi | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue