sync with main (#86)

* fix ENABLE_TELEMETRY env variable value for lantern

* fix rubocop

* update build command for new version of lantern

* update version

config.rb

@@ -147,9 +147,9 @@ def self.e2e_test?
   # Lantern
   override :lantern_top_domain, "db.lantern.dev", string
   override :lantern_dns_email, "varik@lantern.dev", string
-  override :lantern_default_version, "0.3.1", string
-  override :lantern_extras_default_version, "0.2.3", string
-  override :lantern_minor_default_version, "2", string
+  override :lantern_default_version, "0.4.0", string
+  override :lantern_extras_default_version, "0.4.0", string
+  override :lantern_minor_default_version, "1", string
   override :lantern_backup_bucket, "walg-dev-backups"
   override :e2e_test, "0"
   override :backup_retention_days, 7, int

rhizome/lantern/bin/update_lantern

@@ -12,7 +12,7 @@ version_tag = "v#{$configure_hash["version"]}"
 r "sudo docker exec -u root #{$container_name} bash -c 'cd /tmp && rm -rf lantern || true'"
 r "sudo docker exec -u root #{$container_name} bash -c 'cd /tmp && git clone https://github.com/lanterndata/lantern.git --recursive'"
 r "sudo docker exec -u root #{$container_name} bash -c 'cd /tmp/lantern && git checkout #{version_tag}'"
-r "sudo docker exec -u root #{$container_name} bash -c 'cd /tmp/lantern && git submodule update --recursive && mkdir build'"
-r "sudo docker exec -u root #{$container_name} bash -c 'cd /tmp/lantern/build && cmake -DBUILD_FOR_DISTRIBUTING=YES -DMARCH_NATIVE=ON ..'"
-r "sudo docker exec -u root #{$container_name} bash -c 'cd /tmp/lantern/build && make install'"
+r "sudo docker exec -u root #{$container_name} bash -c 'cd /tmp/lantern && git submodule update --recursive'"
+r "sudo docker exec -u root #{$container_name} bash -c 'cmake -DBUILD_FOR_DISTRIBUTING=YES -DMARCH_NATIVE=ON -S /tmp/lantern/lantern_hnsw -B /tmp/lantern/lantern_hnsw/build'"
+r "sudo docker exec -u root #{$container_name} bash -c 'make -C /tmp/lantern/lantern_hnsw/build install -j'"
 r "sudo docker exec -u root #{$container_name} bash -c 'rm -rf /tmp/lantern'"