Browse Source

devenv: remove repo local colima (#85590)

joshuarli 2 weeks ago
parent
commit
f2abdc13d1
2 changed files with 6 additions and 47 deletions
  1. 1 25
      devenv/config.ini
  2. 5 22
      devenv/sync.py

+ 1 - 25
devenv/config.ini

@@ -1,5 +1,5 @@
 [devenv]
-minimum_version = 1.13.0
+minimum_version = 1.14.2
 
 [venv.sentry]
 python = 3.13.1
@@ -42,30 +42,6 @@ linux_x86_64_sha256 = 83bf07dd343002a26211cf1fcd46a9d9534219aad42ee02847816940bf
 version = v22.11.0
 yarn_version = 1.22.22
 
-[colima]
-darwin_x86_64 = https://github.com/abiosoft/colima/releases/download/v0.7.5/colima-Darwin-x86_64
-darwin_x86_64_sha256 = 53f78b4aaef5fb5dab65cae19fba4504047de1fdafa152fba90435d8a7569c2b
-darwin_arm64 = https://github.com/abiosoft/colima/releases/download/v0.7.5/colima-Darwin-arm64
-darwin_arm64_sha256 = 267696d6cb28eaf6daa3ea9622c626697b4baeb847b882d15b26c732e841913c
-linux_x86_64 = https://github.com/abiosoft/colima/releases/download/v0.7.5/colima-Linux-x86_64
-linux_x86_64_sha256 = a3d440033776b2fb0cdd6139a2dbebf6764aabf78a671d4aa13b45c26df21a8a
-linux_arm64 = https://github.com/abiosoft/colima/releases/download/v0.7.5/colima-Linux-aarch64
-linux_arm64_sha256 = 330e11a4b2e5ce69ee6253635308c9f0f49195f236da01718ede35cdb2729901
-# used for autoupdate
-version = v0.7.5
-
-[lima]
-# upstream github releases aren't built for macOS 14, so we use homebrew binaries
-# from https://formulae.brew.sh/api/formula/lima.json
-darwin_x86_64 = https://ghcr.io/v2/homebrew/core/lima/blobs/sha256:c2e69a572afa3a3cf895643ede988c87dc0622dae4aebc539d5564d820845841
-darwin_x86_64_sha256 = c2e69a572afa3a3cf895643ede988c87dc0622dae4aebc539d5564d820845841
-darwin_arm64 = https://ghcr.io/v2/homebrew/core/lima/blobs/sha256:be8e2b92961eca2f862f1a994dbef367e86d36705a705ebfa16d21c7f1366c35
-darwin_arm64_sha256 = be8e2b92961eca2f862f1a994dbef367e86d36705a705ebfa16d21c7f1366c35
-linux_x86_64 = https://ghcr.io/v2/homebrew/core/lima/blobs/sha256:741e9c7345e15f04b8feaf5034868f00fc3ff792226c485ab2e7679803411e0c
-linux_x86_64_sha256 = 741e9c7345e15f04b8feaf5034868f00fc3ff792226c485ab2e7679803411e0c
-# used for autoupdate
-version = 0.23.2
-
 # kept here only for compatibility with older `devenv`
 [python]
 version = 3.13.1

+ 5 - 22
devenv/sync.py

@@ -82,7 +82,7 @@ def check_minimum_version(minimum_version: str) -> bool:
 
 
 def main(context: dict[str, str]) -> int:
-    minimum_version = "1.13.0"
+    minimum_version = "1.14.2"
     if not check_minimum_version(minimum_version):
         raise SystemExit(
             f"""
@@ -111,13 +111,10 @@ Then, use it to run sync this one time.
 
     USE_OLD_DEVSERVICES = os.environ.get("USE_OLD_DEVSERVICES") == "1"
 
-    if constants.DARWIN and check_minimum_version("1.14.2"):
-        # `devenv update`ing to >=1.14.0 will install global colima
-        # so if it's there, uninstall the repo local stuff
-        if os.path.exists(f"{constants.root}/bin/colima"):
-            binroot = f"{reporoot}/.devenv/bin"
-            colima.uninstall(binroot)
-            limactl.uninstall(binroot)
+    if constants.DARWIN and os.path.exists(f"{constants.root}/bin/colima"):
+        binroot = f"{reporoot}/.devenv/bin"
+        colima.uninstall(binroot)
+        limactl.uninstall(binroot)
 
     from devenv.lib import node
 
@@ -139,20 +136,6 @@ Then, use it to run sync this one time.
     print(f"ensuring {repo} venv at {venv_dir}...")
     venv.ensure(venv_dir, python_version, url, sha256)
 
-    if constants.DARWIN:
-        colima.install(
-            repo_config["colima"]["version"],
-            repo_config["colima"][constants.SYSTEM_MACHINE],
-            repo_config["colima"][f"{constants.SYSTEM_MACHINE}_sha256"],
-            reporoot,
-        )
-        limactl.install(
-            repo_config["lima"]["version"],
-            repo_config["lima"][constants.SYSTEM_MACHINE],
-            repo_config["lima"][f"{constants.SYSTEM_MACHINE}_sha256"],
-            reporoot,
-        )
-
     if not run_procs(
         repo,
         reporoot,