From 53d259da2032758dfe8fec6d7328095210ba69db Mon Sep 17 00:00:00 2001
From: Joshua Li <joshuarli98@gmail.com>
Date: Tue, 5 Nov 2024 12:31:43 -0800
Subject: [PATCH 1/2] add colima via devenv
---
.envrc | 16 ++++++++++++++++
Brewfile | 3 +++
devenv/config.ini | 23 +++++++++++++++++++++++
devenv/sync.py | 31 +++++++++++++++++++++++++++++++
4 files changed, 73 insertions(+)
create mode 100644 devenv/config.ini
create mode 100644 devenv/sync.py
diff --git a/.envrc b/.envrc
index 4ad28e85c3a..e7503df2ab8 100644
--- a/.envrc
+++ b/.envrc
@@ -1,6 +1,10 @@
#!/bin/bash
# shellcheck disable=SC1091
+if [[ -f "${PWD}/.env" ]]; then
+ dotenv
+fi
+
if [ ! -d .venv ]; then
echo "warning: creating virtualenv for the first time"
if which pyenv > /dev/null; then
@@ -19,4 +23,16 @@ else
unset PS1
fi
+PATH_add "${HOME}/.local/share/sentry-devenv/bin"
+
+# devenv is currently only used for colima + devservices
+# so we aren't requiring it at the moment
+
+#if ! command -v devenv >/dev/null; then
+# echo "install devenv: https://github.com/getsentry/devenv#install"
+# return 1
+#fi
+
+PATH_add "${PWD}/.devenv/bin"
+
. scripts/rust-envvars
diff --git a/Brewfile b/Brewfile
index c35e195944a..17707b5139b 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,2 +1,5 @@
+# this is docker cli (not desktop) which is needed for interacting with colima
+brew 'docker'
+
# necessary for rust-snuba
brew 'cmake'
diff --git a/devenv/config.ini b/devenv/config.ini
new file mode 100644
index 00000000000..dbd1441f84c
--- /dev/null
+++ b/devenv/config.ini
@@ -0,0 +1,23 @@
+[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
diff --git a/devenv/sync.py b/devenv/sync.py
new file mode 100644
index 00000000000..0e016667add
--- /dev/null
+++ b/devenv/sync.py
@@ -0,0 +1,31 @@
+from devenv import constants
+from devenv.lib import brew, config, colima, limactl, proc
+
+def main(context: dict[str, str]) -> int:
+ reporoot = context["reporoot"]
+ cfg = config.get_repo(reporoot)
+
+ brew.install()
+
+ proc.run(
+ (f"{constants.homebrew_bin}/brew", "bundle"),
+ cwd=reporoot,
+ )
+
+ colima.install(
+ cfg["colima"]["version"],
+ cfg["colima"][constants.SYSTEM_MACHINE],
+ cfg["colima"][f"{constants.SYSTEM_MACHINE}_sha256"],
+ reporoot,
+ )
+ limactl.install(
+ cfg["lima"]["version"],
+ cfg["lima"][constants.SYSTEM_MACHINE],
+ cfg["lima"][f"{constants.SYSTEM_MACHINE}_sha256"],
+ reporoot,
+ )
+
+ # start colima if it's not already running
+ colima.start(reporoot)
+
+ return 0
From 37ca9fcdd932e758bafbb6b6c8c168353455f15f Mon Sep 17 00:00:00 2001
From: "getsantry[bot]" <66042841+getsantry[bot]@users.noreply.github.com>
Date: Tue, 5 Nov 2024 20:41:46 +0000
Subject: [PATCH 2/2] [getsentry/action-github-commit] Auto commit
---
devenv/sync.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/devenv/sync.py b/devenv/sync.py
index 0e016667add..ab02fec4065 100644
--- a/devenv/sync.py
+++ b/devenv/sync.py
@@ -1,5 +1,6 @@
from devenv import constants
-from devenv.lib import brew, config, colima, limactl, proc
+from devenv.lib import brew, colima, config, limactl, proc
+
def main(context: dict[str, str]) -> int:
reporoot = context["reporoot"]