-
Notifications
You must be signed in to change notification settings - Fork 123
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
4 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -153,7 +153,7 @@ VENVDIR="${SOURCE_ROOT}/.venv" | |
# We need at least pip 20.3 for Big Sur support, see https://pip.pypa.io/en/stable/news/#id48 | ||
# Latest pip is 21.0.1 | ||
"${VENVDIR}"/bin/pip install "pip>=20.3" | ||
"${VENVDIR}"/bin/pip install --upgrade glean_parser==$GLEAN_PARSER_VERSION | ||
"${VENVDIR}"/bin/pip install --upgrade "git+ssh://[email protected]/badboy/glean_parser@build-date#egg=glean-parser" | ||
|
||
# Run the glinter | ||
# Turn its warnings into warnings visible in Xcode (but don't do for the success message) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -66,25 +66,6 @@ module_name = sys.argv[2] | |
expected_version = sys.argv[3] | ||
try: | ||
module = importlib.import_module(module_name) | ||
except ImportError: | ||
found_version = None | ||
else: | ||
found_version = getattr(module, '__version__') | ||
if found_version != expected_version: | ||
if not offline: | ||
subprocess.check_call([ | ||
sys.executable, | ||
'-m', | ||
'pip', | ||
'install', | ||
'--upgrade', | ||
f'{module_name}=={expected_version}' | ||
]) | ||
else: | ||
print(f'Using Python environment at {sys.executable},') | ||
print(f'expected glean_parser version {expected_version}, found {found_version}.') | ||
sys.exit(1) | ||
try: | ||
subprocess.check_call([ | ||
sys.executable, | ||
'-m', | ||
|
@@ -433,7 +414,7 @@ except: | |
|
||
// Setup a miniconda environment. conda is used because it works | ||
// non-interactively on Windows, unlike the standard Python installers | ||
conda "Miniconda3", "Miniconda3-${MINICONDA_VERSION}", "64", ["glean_parser==${GLEAN_PARSER_VERSION}"] | ||
conda "Miniconda3", "Miniconda3-${MINICONDA_VERSION}", "64", ["git+ssh://[email protected]/badboy/glean_parser@build-date#egg=glean-parser"] | ||
} | ||
File envDir = new File( | ||
condaBootstrapDir, | ||
|
@@ -503,7 +484,7 @@ except: | |
// Print the required glean_parser version to the console. This is | ||
// offline builds, and is mentioned in the documentation for offline | ||
// builds. | ||
println("Requires glean_parser==${GLEAN_PARSER_VERSION}") | ||
println("Requires glean_parser==git") | ||
|
||
File envDir = setupPythonEnvironmentTasks(project) | ||
// Store in both gleanCondaDir (for backward compatibility reasons) and | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
github "httpswift/swifter" "1.5.0" | ||
github "1024jp/GzipSwift" "5.1.1" | ||
github "mozilla/glean" "main" | ||
github "badboy/glean" "with-build-date" |