From b916413da96908f54e44852288ab17436f20ea16 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 1 Jun 2024 12:49:20 +0100 Subject: [PATCH 1/3] add direnv --- .envrc | 2 ++ .gitignore | 1 + bencher.deps.yaml | 4 ++++ 3 files changed, 7 insertions(+) create mode 100644 .envrc diff --git a/.envrc b/.envrc new file mode 100644 index 00000000..c61b2a82 --- /dev/null +++ b/.envrc @@ -0,0 +1,2 @@ +watch_file pixi.lock +eval "$(pixi shell-hook)" \ No newline at end of file diff --git a/.gitignore b/.gitignore index a273b129..520c8e3b 100644 --- a/.gitignore +++ b/.gitignore @@ -176,3 +176,4 @@ log/** .pixi *.egg-info +metadata.json diff --git a/bencher.deps.yaml b/bencher.deps.yaml index 67b5cc65..803434ea 100644 --- a/bencher.deps.yaml +++ b/bencher.deps.yaml @@ -7,6 +7,7 @@ apt_tools: - python3-pip - apt-utils - jq + - direnv pip_language-toolchain: - flit @@ -15,3 +16,6 @@ pip_language-toolchain: script_pixi-user: - scripts/install_pixi.sh + +run_direnv-user: + - echo "eval "$(direnv hook bash)"" From f918aad4e0ec521f67362c3b3ac964bfb83c1181 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 1 Jun 2024 13:02:20 +0100 Subject: [PATCH 2/3] update direnv sourcing --- bencher.deps.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bencher.deps.yaml b/bencher.deps.yaml index 803434ea..7e321c35 100644 --- a/bencher.deps.yaml +++ b/bencher.deps.yaml @@ -18,4 +18,4 @@ script_pixi-user: - scripts/install_pixi.sh run_direnv-user: - - echo "eval "$(direnv hook bash)"" + - echo "eval \"$(direnv hook bash)\" >> ~/.bashrc" From 5ae3a3ed4817f25ba29b6451f06373952de63943 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 1 Jun 2024 15:46:16 +0100 Subject: [PATCH 3/3] alternative env --- bencher.deps.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bencher.deps.yaml b/bencher.deps.yaml index 7e321c35..a97aaa30 100644 --- a/bencher.deps.yaml +++ b/bencher.deps.yaml @@ -18,4 +18,5 @@ script_pixi-user: - scripts/install_pixi.sh run_direnv-user: - - echo "eval \"$(direnv hook bash)\" >> ~/.bashrc" + - echo "eval \"$(direnv hook bash)\" >> $HOME/.bashrc" + - echo -e "source /opt/ros/humble/setup.bash" >> $HOME/.bashrc