diff options
| author | QMK Bot <hello@qmk.fm> | 2024-07-11 23:50:39 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-11 14:50:39 +0100 |
| commit | 2e671cfd8be1a867cb6717732f1045fc026aeba0 (patch) | |
| tree | e2940aea70b6faa402b5695ff09ab541b6910a83 | |
| parent | 1b8b6801d4f896409a765d302e7e0d50ff089692 (diff) | |
[CI] Format code according to conventions (#24095)
Format code according to conventions
| -rwxr-xr-x | util/ci/index_generator.py | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/util/ci/index_generator.py b/util/ci/index_generator.py index b6440bbffb..f2f7f4d416 100755 --- a/util/ci/index_generator.py +++ b/util/ci/index_generator.py | |||
| @@ -48,18 +48,20 @@ def _ansi2html_styles(): | |||
| 48 | return "\n".join([str(s) for s in styles]) | 48 | return "\n".join([str(s) for s in styles]) |
| 49 | 49 | ||
| 50 | 50 | ||
| 51 | def _git_log(count = 4): | 51 | def _git_log(count=4): |
| 52 | os.chdir(qmk_firmware_dir) | 52 | os.chdir(qmk_firmware_dir) |
| 53 | ret = _run(f"git log -n {count} --color=always --no-merges --topo-order --stat").stdout.strip() | 53 | ret = _run(f"git log -n {count} --color=always --no-merges --topo-order --stat").stdout.strip() |
| 54 | os.chdir(orig_cwd) | 54 | os.chdir(orig_cwd) |
| 55 | return ret | 55 | return ret |
| 56 | 56 | ||
| 57 | |||
| 57 | def _git_describe(): | 58 | def _git_describe(): |
| 58 | os.chdir(qmk_firmware_dir) | 59 | os.chdir(qmk_firmware_dir) |
| 59 | ret = _run("git describe --tags --always --dirty").stdout.strip() | 60 | ret = _run("git describe --tags --always --dirty").stdout.strip() |
| 60 | os.chdir(orig_cwd) | 61 | os.chdir(orig_cwd) |
| 61 | return ret | 62 | return ret |
| 62 | 63 | ||
| 64 | |||
| 63 | def _git_revision(): | 65 | def _git_revision(): |
| 64 | os.chdir(qmk_firmware_dir) | 66 | os.chdir(qmk_firmware_dir) |
| 65 | ret = _run("git rev-parse HEAD").stdout.strip() | 67 | ret = _run("git rev-parse HEAD").stdout.strip() |
| @@ -88,22 +90,18 @@ for mdfile in list(sorted(build_dir.glob("failed.log.*"))): | |||
| 88 | 90 | ||
| 89 | txt = KEYBOARD_PATTERN.sub("", KEYMAP_PATTERN.sub("", txt)).strip() | 91 | txt = KEYBOARD_PATTERN.sub("", KEYMAP_PATTERN.sub("", txt)).strip() |
| 90 | 92 | ||
| 91 | failures.append( | 93 | failures.append({ |
| 92 | { | 94 | "stdout": txt, |
| 93 | "stdout": txt, | 95 | "keyboard": m_kb.group("keyboard"), |
| 94 | "keyboard": m_kb.group("keyboard"), | 96 | "keymap": m_km.group("keymap"), |
| 95 | "keymap": m_km.group("keymap"), | 97 | }) |
| 96 | } | ||
| 97 | ) | ||
| 98 | 98 | ||
| 99 | template = env.get_template("index.html.j2") | 99 | template = env.get_template("index.html.j2") |
| 100 | print( | 100 | print(template.render( |
| 101 | template.render( | 101 | ansi2html_styles=_ansi2html_styles(), |
| 102 | ansi2html_styles=_ansi2html_styles(), | 102 | git_log=_git_log(), |
| 103 | git_log=_git_log(), | 103 | git_describe=_git_describe(), |
| 104 | git_describe=_git_describe(), | 104 | git_revision=_git_revision(), |
| 105 | git_revision=_git_revision(), | 105 | binaries=binaries, |
| 106 | binaries=binaries, | 106 | failures=failures, |
| 107 | failures=failures, | 107 | )) |
| 108 | ) | ||
| 109 | ) | ||
