summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/build.yml6
-rw-r--r--prebuilt/.gitignore5
-rw-r--r--prebuilt/linux64/hyperfine.sha11
-rw-r--r--prebuilt/linux64/sccache.sha11
-rw-r--r--prebuilt/mac/hyperfine.sha11
-rw-r--r--prebuilt/mac/sccache.sha11
-rw-r--r--prebuilt/win/hyperfine.exe.sha11
-rw-r--r--prebuilt/win/sccache.exe.sha11
-rw-r--r--std/manual.md9
m---------third_party0
-rwxr-xr-xtools/benchmark.py1
-rwxr-xr-xtools/http_benchmark.py6
-rwxr-xr-xtools/setup.py1
-rw-r--r--tools/third_party.py23
14 files changed, 16 insertions, 41 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dbed7f270..3bed415b7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -72,19 +72,19 @@ jobs:
# https://github.com/denoland/deno/blob/27cd2c97f18c0392bc04c66b786717b2bc677315/std/installer/mod.ts#L185-L193
# TODO(ry) This path modification should rather be done in "cargo test".
run: |
- echo ::add-path::`pwd`/prebuilt/linux64
+ echo ::add-path::`pwd`/third_party/prebuilt/linux64
echo ::add-path::`pwd`/target/release
- name: Environment (mac)
if: startsWith(matrix.os, 'macOS')
run: |
- echo ::add-path::`pwd`/prebuilt/mac
+ echo ::add-path::`pwd`/third_party/prebuilt/mac
echo ::add-path::`pwd`/target/release
- name: Environment (windows)
if: startsWith(matrix.os, 'windows')
run: |
- echo ::add-path::$(pwd)\prebuilt\win
+ echo ::add-path::$(pwd)\third_party\prebuilt\win
echo ::add-path::$(pwd)\target\release
- name: Log versions
diff --git a/prebuilt/.gitignore b/prebuilt/.gitignore
deleted file mode 100644
index e21d75410..000000000
--- a/prebuilt/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.a
-*.lib
-*.exe
-sccache
-hyperfine
diff --git a/prebuilt/linux64/hyperfine.sha1 b/prebuilt/linux64/hyperfine.sha1
deleted file mode 100644
index f935317cd..000000000
--- a/prebuilt/linux64/hyperfine.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c01e9c3d9169065911a1c74e935e0fdf15094e36 \ No newline at end of file
diff --git a/prebuilt/linux64/sccache.sha1 b/prebuilt/linux64/sccache.sha1
deleted file mode 100644
index d85beb0fc..000000000
--- a/prebuilt/linux64/sccache.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0cebfd74e52919197b51a2662b2c206250484003 \ No newline at end of file
diff --git a/prebuilt/mac/hyperfine.sha1 b/prebuilt/mac/hyperfine.sha1
deleted file mode 100644
index 52f34bd71..000000000
--- a/prebuilt/mac/hyperfine.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fe12887d9fcce693fa333992cb46c6ab7ada181e \ No newline at end of file
diff --git a/prebuilt/mac/sccache.sha1 b/prebuilt/mac/sccache.sha1
deleted file mode 100644
index c5777af13..000000000
--- a/prebuilt/mac/sccache.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ee65c55a42822368481c37c56a34ba205c5d2a33 \ No newline at end of file
diff --git a/prebuilt/win/hyperfine.exe.sha1 b/prebuilt/win/hyperfine.exe.sha1
deleted file mode 100644
index 6c6465d72..000000000
--- a/prebuilt/win/hyperfine.exe.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ad87698076d05b3d7d2cdf0705302ccf9444e3f2 \ No newline at end of file
diff --git a/prebuilt/win/sccache.exe.sha1 b/prebuilt/win/sccache.exe.sha1
deleted file mode 100644
index b1182e8ef..000000000
--- a/prebuilt/win/sccache.exe.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ae2658b8e54bbccabdd2d08c8fa3738ba2175651 \ No newline at end of file
diff --git a/std/manual.md b/std/manual.md
index fdace4605..f640618ff 100644
--- a/std/manual.md
+++ b/std/manual.md
@@ -1160,15 +1160,6 @@ The core binding layer for Deno. It is released as a
with a binding API called "libdeno". See the crate documentation for more
details.
-### Updating prebuilt binaries
-
-```shell
-$ ./third_party/depot_tools/upload_to_google_storage.py -b denoland \
- -e ~/.config/gcloud/legacy_credentials/ry@tinyclouds.org/.boto `which sccache`
-$ mv `which sccache`.sha1 prebuilt/linux64/
-$ gsutil acl ch -u AllUsers:R gs://denoland/608be47bf01004aa11d4ed06955414e93934516e
-```
-
### Continuous Benchmarks
See our benchmarks [over here](https://deno.land/benchmarks.html)
diff --git a/third_party b/third_party
-Subproject cab4821cd937dd3c927430f0f0e05a38af1b84a
+Subproject 5567e9cbc81e7e7068a9eee12a71cced029e1e8
diff --git a/tools/benchmark.py b/tools/benchmark.py
index 6edeb1ee4..141e3b187 100755
--- a/tools/benchmark.py
+++ b/tools/benchmark.py
@@ -161,7 +161,6 @@ def run_max_mem_benchmark(deno_exe):
def run_exec_time(deno_exe, build_dir):
- third_party.download_hyperfine()
hyperfine_exe = third_party.get_prebuilt_tool_path("hyperfine")
benchmark_file = os.path.join(build_dir, "hyperfine_results.json")
run([
diff --git a/tools/http_benchmark.py b/tools/http_benchmark.py
index 4f2c768fd..1a56bd1f1 100755
--- a/tools/http_benchmark.py
+++ b/tools/http_benchmark.py
@@ -5,6 +5,7 @@ import sys
import time
import subprocess
import util
+import third_party
# Some of the benchmarks in this file have been renamed. In case the history
# somehow gets messed up:
@@ -193,8 +194,9 @@ def run(server_cmd, port, merge_env=None, origin_cmd=None):
time.sleep(5) # wait for server to wake up. TODO racy.
try:
- cmd = "third_party/wrk/%s/wrk -d %s --latency http://127.0.0.1:%s/" % (
- util.platform(), DURATION, port)
+ wrk = third_party.get_prebuilt_tool_path("wrk")
+ assert os.path.exists(wrk)
+ cmd = "%s -d %s --latency http://127.0.0.1:%s/" % (wrk, DURATION, port)
print cmd
output = subprocess.check_output(cmd, shell=True)
stats = util.parse_wrk_output(output)
diff --git a/tools/setup.py b/tools/setup.py
index e18b5ffd3..c39b88b8f 100755
--- a/tools/setup.py
+++ b/tools/setup.py
@@ -29,7 +29,6 @@ def main():
third_party.download_gn()
third_party.download_clang_format()
third_party.download_clang()
- third_party.download_sccache()
third_party.maybe_download_sysroot()
write_lastchange()
diff --git a/tools/third_party.py b/tools/third_party.py
index bdb5662af..238cb67d7 100644
--- a/tools/third_party.py
+++ b/tools/third_party.py
@@ -11,7 +11,7 @@ from util import add_env_path, executable_suffix, libdeno_path, make_env, rmtree
from util import root_path, run, third_party_path
depot_tools_path = os.path.join(third_party_path, "depot_tools")
-prebuilt_path = os.path.join(root_path, "prebuilt")
+prebuilt_path = os.path.join(third_party_path, "prebuilt")
python_packages_path = os.path.join(third_party_path, "python_packages")
python_site_env = None
@@ -186,16 +186,12 @@ def get_buildtools_tool_path(tool):
tool + executable_suffix)
-# Download the given item from Google storage.
-def download_from_google_storage(item, bucket, base_dir):
+def download_from_google_storage2(sha1_file, bucket):
download_script = os.path.join(depot_tools_path,
"download_from_google_storage.py")
- sha1_file = os.path.join(base_dir, get_platform_dir_name(),
- item + executable_suffix + ".sha1")
run([
sys.executable,
download_script,
- "--platform=" + sys.platform,
"--no_auth",
"--bucket=%s" % bucket,
"--sha1_file",
@@ -204,6 +200,13 @@ def download_from_google_storage(item, bucket, base_dir):
env=google_env())
+# Download the given item from Google storage.
+def download_from_google_storage(item, bucket, base_dir):
+ sha1_file = os.path.join(base_dir, get_platform_dir_name(),
+ item + executable_suffix + ".sha1")
+ download_from_google_storage2(sha1_file, bucket)
+
+
# Download the given item from Chrome Infrastructure Package Deployment.
def download_from_cipd(item, version):
cipd_exe = os.path.join(depot_tools_path, "cipd")
@@ -248,14 +251,6 @@ def download_clang_format():
os.path.join(libdeno_path, "buildtools"))
-def download_sccache():
- download_from_google_storage("sccache", "denoland", prebuilt_path)
-
-
-def download_hyperfine():
- download_from_google_storage("hyperfine", "denoland", prebuilt_path)
-
-
# Download clang by calling the clang update script.
def download_clang():
update_script = os.path.join(libdeno_path, "v8", "tools", "clang",
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 15:41:21 +0000