Skip to content

Commit ad7ec35

Browse files
committed
ci try
1 parent 0a95d51 commit ad7ec35

File tree

1 file changed

+21
-7
lines changed

1 file changed

+21
-7
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ jobs:
9292
run: npm ci
9393

9494
- name: Install Foundry
95+
shell: bash
9596
run: |
9697
set -e
9798
curl -L https://foundry.paradigm.xyz | bash
@@ -104,14 +105,27 @@ jobs:
104105
export PATH="$HOME/.foundry/bin:$HOME/.cargo/bin:$HOME/.local/bin:$PATH"
105106
106107
# Run `foundryup` from a known install location so we don't depend on shell PATH.
107-
if [ -x "$HOME/.foundry/bin/foundryup" ]; then
108-
"$HOME/.foundry/bin/foundryup"
109-
elif [ -x "$HOME/.cargo/bin/foundryup" ]; then
110-
"$HOME/.cargo/bin/foundryup"
111-
elif [ -x "$HOME/.local/bin/foundryup" ]; then
112-
"$HOME/.local/bin/foundryup"
108+
# (If `foundryup` isn't found in PATH, we currently fail with "command not found".)
109+
foundryup_bin=""
110+
if [ -f "$HOME/.foundry/bin/foundryup" ]; then
111+
foundryup_bin="$HOME/.foundry/bin/foundryup"
112+
elif [ -f "$HOME/.cargo/bin/foundryup" ]; then
113+
foundryup_bin="$HOME/.cargo/bin/foundryup"
114+
elif [ -f "$HOME/.local/bin/foundryup" ]; then
115+
foundryup_bin="$HOME/.local/bin/foundryup"
116+
fi
117+
118+
if [ -n "$foundryup_bin" ]; then
119+
"$foundryup_bin"
113120
else
114-
foundryup
121+
echo "foundryup not found after installer" >&2
122+
echo "HOME=$HOME" >&2
123+
echo "PATH=$PATH" >&2
124+
command -v foundryup >&2 || true
125+
ls -la "$HOME/.foundry/bin" >&2 || true
126+
ls -la "$HOME/.cargo/bin" >&2 || true
127+
ls -la "$HOME/.local/bin" >&2 || true
128+
exit 1
115129
fi
116130
117131
# Verify toolchain binaries required by the integration tests.

0 commit comments

Comments
 (0)