Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

devenv: define current limactl version #78800

Merged
merged 7 commits into from
Oct 11, 2024
Merged

devenv: define current limactl version #78800

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
892e2c0
keep current for part 1
joshuarli Oct 8, 2024
c388372
bump devenv and compat limactl call
joshuarli Oct 9, 2024
e1db289
fix bad rebase lol
joshuarli Oct 9, 2024
1a21037
check_minimum_version
joshuarli Oct 10, 2024
a479d42
better
joshuarli Oct 10, 2024
8d8150f
min version check will be part of config
joshuarli Oct 10, 2024
4046a31
mypy pls
joshuarli Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions devenv/config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,18 @@ linux_arm64_sha256 = 6ecba675e90d154f22e20200fa5684f20ad1495b73c0462f1bd7da4e9d0
# used for autoupdate
version = v0.6.6

[lima]
darwin_x86_64 = https://github.com/lima-vm/lima/releases/download/v0.19.1/lima-0.19.1-Darwin-x86_64.tar.gz
darwin_x86_64_sha256 = ac8827479f66ef1b288b31f164b22f6433faa14c44ce5bbebe09e6e913582479
darwin_arm64 = https://github.com/lima-vm/lima/releases/download/v0.19.1/lima-0.19.1-Darwin-arm64.tar.gz
darwin_arm64_sha256 = 0dfcf3a39782baf1c2ea43cf026f8df0321c671d914c105fbb78de507aa8bda4
linux_x86_64 = https://github.com/lima-vm/lima/releases/download/v0.19.1/lima-0.19.1-Linux-x86_64.tar.gz
linux_x86_64_sha256 = 7d18b1716aae14bf98d6ea93a703e8877b0c3142f7ba2e87401d47d5d0fe3ff1
linux_arm64 = https://github.com/lima-vm/lima/releases/download/v0.19.1/lima-0.19.1-Linux-aarch64.tar.gz
linux_arm64_sha256 = c55e57ddbefd9988d0f3676bb873bcc6e0f7b3c3d47a1f07599ee151c5198d96
# used for autoupdate
version = 0.19.1

# kept here only for compatibility with older `devenv`
[python]
version = 3.12.6
Expand Down
31 changes: 13 additions & 18 deletions devenv/sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,27 +108,22 @@ def main(context: dict[str, str]) -> int:
venv.ensure(venv_dir, python_version, url, sha256)

if constants.DARWIN:
try:
colima.install(
repo_config["colima"]["version"],
repo_config["colima"][constants.SYSTEM_MACHINE],
repo_config["colima"][f"{constants.SYSTEM_MACHINE}_sha256"],
reporoot,
)
except TypeError:
# this is needed for devenv <=1.4.0,>1.2.3 to finish syncing and therefore update itself
colima.install(
repo_config["colima"]["version"],
repo_config["colima"][constants.SYSTEM_MACHINE],
repo_config["colima"][f"{constants.SYSTEM_MACHINE}_sha256"],
)

# TODO: move limactl version into per-repo config
colima.install(
repo_config["colima"]["version"],
repo_config["colima"][constants.SYSTEM_MACHINE],
repo_config["colima"][f"{constants.SYSTEM_MACHINE}_sha256"],
reporoot,
)
try:
limactl.install(reporoot)
except TypeError:
# this is needed for devenv <=1.4.0,>1.2.3 to finish syncing and therefore update itself
limactl.install()
# again, it'll take 2 syncs to get here
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,
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev-frozen.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ s3transfer==0.10.0
selenium==4.16.0
sentry-arroyo==2.16.5
sentry-cli==2.16.0
sentry-devenv==1.10.2
sentry-devenv==1.11.0
sentry-forked-django-stubs==5.1.0.post2
sentry-forked-djangorestframework-stubs==3.15.1.post2
sentry-kafka-schemas==0.1.111
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--index-url https://pypi.devinfra.sentry.io/simple

sentry-devenv>=1.10.2
sentry-devenv>=1.11.0

covdefaults>=2.3.0
docker>=6
Expand Down
Loading