Skip to content

Commit

Permalink
[TESTING] use WIP glean_parser
Browse files Browse the repository at this point in the history
  • Loading branch information
badboy committed Jan 10, 2022
1 parent 219d244 commit 70409b7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 23 deletions.
2 changes: 1 addition & 1 deletion glean-core/ios/sdk_generator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion samples/ios/app/Cartfile
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"

0 comments on commit 70409b7

Please sign in to comment.