mirror of
https://github.com/ivabus/pantry
synced 2024-11-10 02:25:18 +03:00
fixes for teaxyz/cli@0.8.0
This commit is contained in:
parent
16ec5ae85c
commit
ff4c90ba25
|
@ -65,10 +65,10 @@ async function __build(pkg: Package) {
|
|||
}
|
||||
|
||||
function mkenv() {
|
||||
const env = useShellEnv(resolved)
|
||||
const env = useShellEnv({ installations: resolved})
|
||||
|
||||
if (platform == 'darwin') {
|
||||
env.vars['MACOSX_DEPLOYMENT_TARGET'] = ['11.0']
|
||||
env['MACOSX_DEPLOYMENT_TARGET'] = ['11.0']
|
||||
}
|
||||
|
||||
return env
|
||||
|
@ -86,7 +86,7 @@ async function __build(pkg: Package) {
|
|||
cd "${src}"
|
||||
|
||||
export SRCROOT="${src}"
|
||||
${expand(env.vars)}
|
||||
${expand(env)}
|
||||
|
||||
${/*FIXME hardcoded paths*/ ''}
|
||||
export PATH=/opt/tea.xyz/var/pantry/scripts/brewkit:"$PATH"
|
||||
|
|
|
@ -32,7 +32,7 @@ async function test(self: Installation) {
|
|||
const yml = await pantry.getYAML(self.pkg).parse()
|
||||
const deps = await deps4(self.pkg)
|
||||
const installations = await prepare(deps)
|
||||
const env = useShellEnv([self, ...installations])
|
||||
const env = useShellEnv({ installations: [self, ...installations] })
|
||||
|
||||
let text = undent`
|
||||
#!/bin/bash
|
||||
|
@ -41,7 +41,7 @@ async function test(self: Installation) {
|
|||
set -o pipefail
|
||||
set -x
|
||||
|
||||
${expand(env.vars)}
|
||||
${expand(env)}
|
||||
|
||||
`
|
||||
|
||||
|
|
Loading…
Reference in a new issue