mirror of
https://github.com/garrytan/gstack.git
synced 2026-11-05 00:03:15 +01:00
Merge remote-tracking branch 'origin/capy/gstack-install-wave' into capy/gstack-autoplan-wave
This commit is contained in:
commit
89a95217fa
2 files changed
+2
-1
No files matched your search
@@ -158,7 +158,7 @@ if printf '%s\n' "$PINS_OUT" | grep -q '^PINS_VERDICT: '; then
|
||||
$(printf '%s\n' "$PINS_OUT" | sed -n 's/^PIN: bun \([^ ]*\) exact \([^ ]*\) lane=[a-z]*$/\1 \2/p')
|
||||
EOF_PINS
|
||||
pins_ok "$WANT" || stop RUNTIME_PIN_CONFLICT "Bun conflict: gstack needs >=$WANT, $PROJECT pins $(printf '%s\n' "$PINS_OUT" | sed -n 's/^PIN_SUMMARY: //p' | grep '^bun' | tr '\n' ';' | sed 's/;$//')" "raise the project's pin to $WANT or newer, or install gstack on a machine the project accepts"
|
||||
if [ "$LD_VER" = "$WANT" ]; then reuse_ld; else install_bun "bun ${HAVE:-absent} does not satisfy the project pins (or gstack's minimum $WANT)"; fi
|
||||
if [ "$LD_VER" = "$WANT" ]; then reuse_ld; else install_bun "bun ${HAVE:-absent} does not satisfy the project pins (bun $WANT) or gstack's minimum $GSTACK_BUN_TESTED"; fi
|
||||
fi
|
||||
else
|
||||
# No pin report (no project, or a Bun that cannot run the parser): the
|
||||
|
||||
@@ -171,6 +171,7 @@ describe('gstack-capy-install', () => {
|
||||
expect(sh(`cd "${f.base}/z" && zip -qr "${zip}" bun-linux-x64`).status).toBe(0);
|
||||
const adopted = run(f, ['--project', project], { STUB_CURL_ZIP: zip });
|
||||
expect(adopted.stdout).toContain('installing bun 1.4.3 from its release archive');
|
||||
expect(adopted.stdout).not.toContain("gstack's minimum 1.4.3");
|
||||
expect(f.calls().filter(l => l.startsWith('curl '))).toEqual([expect.stringContaining('https://github.com/oven-sh/bun/releases/download/bun-v1.4.3/bun-linux')]);
|
||||
expect(adopted.status).toBe(3);
|
||||
expect(adopted.stderr).toContain('SHA-256 mismatch');
|
||||
|
||||
Reference in new issue
Block a user