| Serge Bazanski | 0d3e609 | 2023-09-01 19:08:02 +0200 | [diff] [blame] | 1 | diff -ur com_googlesource_gerrit_bazlets.orig/tools/js.bzl com_googlesource_gerrit_bazlets/tools/js.bzl |
| 2 | --- com_googlesource_gerrit_bazlets.orig/tools/js.bzl 2023-09-01 19:06:56.873026919 +0200 |
| 3 | +++ com_googlesource_gerrit_bazlets/tools/js.bzl 2023-09-01 19:07:11.222983491 +0200 |
| 4 | @@ -26,7 +26,7 @@ |
| 5 | else: |
| 6 | fail("repository %s not in {%s,%s}" % (repository, GERRIT, NPMJS)) |
| 7 | |
| 8 | - python = ctx.which("python") |
| 9 | + python = ctx.which("python3") |
| 10 | script = ctx.path(ctx.attr._download_script) |
| 11 | |
| 12 | args = [python, script, "-o", dest, "-u", url, "-v", sha1] |
| 13 | @@ -49,7 +49,7 @@ |
| 14 | |
| 15 | # for use in repo rules. |
| 16 | def _run_npm_binary_str(ctx, tarball, args): |
| 17 | - python_bin = ctx.which("python") |
| 18 | + python_bin = ctx.which("python3") |
| 19 | return " ".join([ |
| 20 | python_bin, |
| 21 | ctx.path(ctx.attr._run_npm), |
| 22 | @@ -63,7 +63,7 @@ |
| 23 | version_name = "%s__version.json" % ctx.name |
| 24 | |
| 25 | cmd = [ |
| 26 | - ctx.which("python"), |
| 27 | + ctx.which("python3"), |
| 28 | ctx.path(ctx.attr._download_bower), |
| 29 | "-b", |
| 30 | "%s" % _run_npm_binary_str(ctx, ctx.attr._bower_archive, []), |
| 31 | @@ -311,7 +311,7 @@ |
| 32 | zips = [z for d in ctx.attr.deps for z in d[ComponentInfo].transitive_zipfiles.to_list()] |
| 33 | |
| 34 | hermetic_npm_binary = " ".join([ |
| 35 | - "python", |
| 36 | + "python3", |
| 37 | "$p/" + ctx.file._run_npm.path, |
| 38 | "$p/" + ctx.file._bundler_archive.path, |
| 39 | "--inline-scripts", |
| 40 | @@ -360,7 +360,7 @@ |
| 41 | |
| 42 | if ctx.attr.split: |
| 43 | hermetic_npm_command = "export PATH && " + " ".join([ |
| 44 | - "python", |
| 45 | + "python3", |
| 46 | ctx.file._run_npm.path, |
| 47 | ctx.file._crisper_archive.path, |
| 48 | "--always-write-script", |
| 49 | diff -ur com_googlesource_gerrit_bazlets.orig/tools/maven_jar.bzl com_googlesource_gerrit_bazlets/tools/maven_jar.bzl |
| 50 | --- com_googlesource_gerrit_bazlets.orig/tools/maven_jar.bzl 2023-09-01 19:05:59.782193961 +0200 |
| 51 | +++ com_googlesource_gerrit_bazlets/tools/maven_jar.bzl 2023-09-01 19:06:23.679125192 +0200 |
| 52 | @@ -136,7 +136,7 @@ |
| 53 | srcjar_path = ctx.path("/".join(["src", srcjar])) |
| 54 | srcurl = url + "-sources.jar" |
| 55 | |
| 56 | - python = ctx.which("python") |
| 57 | + python = ctx.which("python3") |
| 58 | script = ctx.path(ctx.attr._download_script) |
| 59 | |
| 60 | args = [python, script, "-o", binjar_path, "-u", binurl] |