Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove left-over wrong comment. #322

Merged
merged 2 commits into from
May 4, 2021
Merged

Remove left-over wrong comment. #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d97a6cc
Remove left-over wrong comment.
badboy May 4, 2021
bf467be
Use checksums for external linting tools
badboy May 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ install: clean ## install the package to the active Python's site-packages
python setup.py install

install-kotlin-linters: ## install ktlint and detekt for linting Kotlin output
curl -sSLO https://github.com/shyiko/ktlint/releases/download/0.29.0/ktlint
test -f ktlint || curl -sSLO https://github.com/shyiko/ktlint/releases/download/0.29.0/ktlint
echo "03c9f9f78f80bcdb44c292d95e4d9abf221daf5e377673c1b6675a8003eab94d *ktlint" | sha256sum -c -
chmod a+x ktlint
curl -sSL --output "detekt-cli-1.1.1-all.jar" https://bintray.com/arturbosch/code-analysis/download_file?file_path=io%2Fgitlab%2Farturbosch%2Fdetekt%2Fdetekt-cli%2F1.1.1%2Fdetekt-cli-1.1.1-all.jar
test -f detekt-cli.jar || curl -sSL --output "detekt-cli.jar" https://github.com/detekt/detekt/releases/download/v1.16.0/detekt-cli-1.16.0-all.jar
echo "dd63aae60cce4b0516ffc11d31b6280d4010ab481754c7e49b2c9e78db877ca4 *detekt-cli.jar" | sha256sum -c -
2 changes: 1 addition & 1 deletion glean_parser/templates/markdown.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,6 @@ This ping contains no metrics.
{% endfor %}
Data categories are [defined here](https://wiki.mozilla.org/Firefox/Data_Collection).

<!-- AUTOGENERATED BY glean_parser. DO NOT EDIT. DO NOT COMMIT. -->
<!-- AUTOGENERATED BY glean_parser. DO NOT EDIT. -->
{# The rendered markdown is autogenerated, but this
Jinja2 template is not. Please file bugs! #}
7 changes: 1 addition & 6 deletions tests/test_kotlin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,8 @@
ROOT = Path(__file__).parent


# The version of Detekt built. Must match the version checked out in
# Makefile
DETEKT_VERSION = "1.1.1"


def run_detekt(files):
detekt_exec = ROOT.parent / f"detekt-cli-{DETEKT_VERSION}-all.jar"
detekt_exec = ROOT.parent / "detekt-cli.jar"
# We want to make sure this runs on CI, but it's not required
# for local development
if detekt_exec.is_file() or "CI" in os.environ:
Expand Down