chore: do not run cargo install as root

rust-or · Dec 26, 2024 · 01a4635 · 01a4635
1 parent 0de4cbc
commit 01a4635
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -13,5 +13,5 @@
       ]
     }
   },
-  "postCreateCommand": "mkdir -p ~/.local/share/bash-completion/completions && rustup completions bash > ~/.local/share/bash-completion/completions/rustup && rustup completions bash cargo > ~/.local/share/bash-completion/completions/cargo"
+  "postCreateCommand": "./build/postsetup.sh && P=~/.local/share/bash-completion/completions && mkdir -p $P && rustup completions bash > $P/rustup && rustup completions bash cargo > $P/cargo"
 }
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -25,7 +25,7 @@ jobs:
         with:
           node-version: 22
       - name: install deps
-        run: ./build/setup.sh
+        run: ./build/setup.sh && ./build/postsetup.sh
       - name: Build with all default solvers (no cplex)
         run: cargo build --features all_default_solvers --tests
       - name: Run tests with all default solvers (no cplex)

diff --git a/build/postsetup.sh b/build/postsetup.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# Print commands, exit upon error
+set -ex
+
+# Install wasm-pack
+cargo install wasm-pack
diff --git a/build/setup.sh b/build/setup.sh
@@ -13,6 +13,3 @@ DEBIAN_FRONTEND=noninteractive sudo apt-get install -y coinor-cbc coinor-libcbc-
 curl -LO https://github.com/rust-or/good_lp/releases/download/cplex/cplex.bin
 chmod u+x cplex.bin
 ./cplex.bin -f ./response.properties
-
-# Install wasm-pack
-cargo install wasm-pack
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,5 +13,5 @@ @@
           ]
         }
       },
-      "postCreateCommand": "mkdir -p ~/.local/share/bash-completion/completions && rustup completions bash > ~/.local/share/bash-completion/completions/rustup && rustup completions bash cargo > ~/.local/share/bash-completion/completions/cargo"
+      "postCreateCommand": "./build/postsetup.sh && P=~/.local/share/bash-completion/completions && mkdir -p $P && rustup completions bash > $P/rustup && rustup completions bash cargo > $P/cargo"
     }