Merge branch 'main' into egglog-simpler-schedules

Author: pavpanchekha

Dockerfile

@@ -8,7 +8,7 @@ FROM rust:1.88.0 AS egg-herbie-builder
 WORKDIR /herbie
 COPY egg-herbie egg-herbie
 RUN cargo build --release --manifest-path=egg-herbie/Cargo.toml
-RUN cargo install --locked --git https://github.com/egraphs-good/egglog.git --rev 052a330de22d40e9eded19e7f0891c921f7f458c
+RUN cargo install egglog --version 1.0.0
 
 # Production image
 FROM racket/racket:8.17-full AS production

Makefile

@@ -29,7 +29,7 @@ egg-herbie:
 	raco pkg install ./egg-herbie
 
 egglog-herbie:
-	cargo install --locked --git https://github.com/egraphs-good/egglog.git --rev 052a330de22d40e9eded19e7f0891c921f7f458c
+	cargo install egglog --version 1.0.0
 
 
 distribution: minimal-distribution
@@ -45,8 +45,8 @@ minimal-distribution:
 	[ ! -f herbie.app ] || (raco distribute herbie-compiled herbie.app && rm herbie.app)
 	[ ! -f herbie ] || (raco distribute herbie-compiled herbie && rm herbie)
 
-nightly: install
-	bash infra/nightly.sh bench/ reports/ --threads 4 --enable "generate:egglog"
+nightly:
+	bash infra/nightly.sh bench/ reports/ --threads 4
 
 upgrade:
 	git pull

infra/nightly.sh

@@ -4,7 +4,10 @@
 set -e -x
 
 # Ensure egglog is in the path
-export PATH="$PATH:$HOME/.cargo/bin/"
+export PATH="$HOME/.cargo/bin/:$PATH"
+rustup update
+
+make install
 
 # Seed is fixed for the whole day; this way two branches run the same seed
 SEED=$(date "+%Y%j")