fix cargo on Sonoma (hopefully) (#3544)

This commit is contained in:
Max Howell 2023-10-06 08:21:54 -04:00 committed by GitHub
parent a94cbfc456
commit 630e7163d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 41 deletions

View file

@ -1,5 +1,5 @@
dependencies: dependencies:
pkgx.sh/brewkit: ^0.46 pkgx.sh/brewkit: ^0
env: env:
PKGX_PANTRY_PATH: ${{srcroot}} PKGX_PANTRY_PATH: ${{srcroot}}
SRCROOT: ${{srcroot}} SRCROOT: ${{srcroot}}

View file

@ -29,13 +29,15 @@ build:
tukaani.org/xz: '*' tukaani.org/xz: '*'
freedesktop.org/pkg-config: ^0.29 freedesktop.org/pkg-config: ^0.29
rust-lang.org/cargo: '*' rust-lang.org/cargo: '*'
script: cargo $ARGS script:
- |
sed -i.bak 's/^curl\s*=\s*"(.+)"$/curl = { version = "\\1", features = ["force-system-lib-on-osx"] }/' Cargo.toml
- cargo install
--root={{ prefix }}
--path=.
env: env:
ARGS: LIBGIT2_SYS_USE_PKG_CONFIG: 1
- install LIBSSH2_SYS_USE_PKG_CONFIG: 1
- --root={{ prefix }}
- --path=.
test: test:
env: env:
CC: clang #FIXME CC: clang #FIXME

View file

@ -1,34 +0,0 @@
distributable:
url: https://github.com/teaxyz/brewkit/archive/refs/tags/v{{ version }}.tar.gz
strip-components: 1
display-name: tea/brewkit
versions:
github: teaxyz/brewkit
dependencies:
deno.land: '>=1.30<1.36.1'
gnu.org/bash: '*'
tea.xyz: '>=0.24.10'
build: |
mkdir -p {{prefix}}
rm -rf {{prefix}}/*
# ^^ because our build infra uses this pkg to build itself
for x in bin libexec lib share deno.*; do
test -e $x && mv $x "{{prefix}}"
done
provides:
- bin/tea-pkg
test:
dependencies:
zlib.net: '*'
script:
pkg test zlib.net
# we would like to test builds but we need a `GITHUB_TOKEN` and
# (currently) we cant figure out how to set that up in CI/CD