mirror of
https://github.com/ArchiveBox/ArchiveBox.git
synced 2026-09-12 19:50:57 +05:00
Prefer non-root providers before apt
This commit is contained in:
parent
de67f574b0
commit
f0bb89ab0c
28
.github/configs/ci-tooling.json
vendored
28
.github/configs/ci-tooling.json
vendored
@ -88,7 +88,7 @@
|
||||
"ci_binaries": [
|
||||
{
|
||||
"name": "{BASH_BINARY}",
|
||||
"binproviders": "env,apt,brew"
|
||||
"binproviders": "env,brew,apt"
|
||||
},
|
||||
{
|
||||
"name": "{PYTHON_BINARY}",
|
||||
@ -96,7 +96,7 @@
|
||||
},
|
||||
{
|
||||
"name": "{JQ_BINARY}",
|
||||
"binproviders": "env,apt,brew"
|
||||
"binproviders": "env,brew,apt"
|
||||
},
|
||||
{
|
||||
"name": "{UV_BINARY}",
|
||||
@ -122,7 +122,7 @@
|
||||
},
|
||||
{
|
||||
"name": "{GIT_BINARY}",
|
||||
"binproviders": "env,apt,brew"
|
||||
"binproviders": "env,brew,apt"
|
||||
},
|
||||
{
|
||||
"name": "{PYTHON_BINARY}",
|
||||
@ -136,7 +136,7 @@
|
||||
"deploy_binaries": [
|
||||
{
|
||||
"name": "{GIT_BINARY}",
|
||||
"binproviders": "env,apt,brew"
|
||||
"binproviders": "env,brew,apt"
|
||||
},
|
||||
{
|
||||
"name": "{PYTHON_BINARY}",
|
||||
@ -154,15 +154,15 @@
|
||||
},
|
||||
{
|
||||
"name": "{PV_BINARY}",
|
||||
"binproviders": "env,apt,brew"
|
||||
"binproviders": "env,brew,apt"
|
||||
},
|
||||
{
|
||||
"name": "{TAR_BINARY}",
|
||||
"binproviders": "env,apt,brew"
|
||||
"binproviders": "env,brew,apt"
|
||||
},
|
||||
{
|
||||
"name": "{TREE_BINARY}",
|
||||
"binproviders": "env,apt,brew"
|
||||
"binproviders": "env,brew,apt"
|
||||
}
|
||||
],
|
||||
"docker_validation_binaries": [
|
||||
@ -278,7 +278,7 @@
|
||||
"docs_binaries": [
|
||||
{
|
||||
"name": "{CURL_BINARY}",
|
||||
"binproviders": "env,apt,brew"
|
||||
"binproviders": "env,brew,apt"
|
||||
},
|
||||
{
|
||||
"name": "{SUDO_BINARY}",
|
||||
@ -288,13 +288,13 @@
|
||||
"git_binaries": [
|
||||
{
|
||||
"name": "{GIT_BINARY}",
|
||||
"binproviders": "env,apt,brew"
|
||||
"binproviders": "env,brew,apt"
|
||||
}
|
||||
],
|
||||
"github_binaries": [
|
||||
{
|
||||
"name": "{GH_BINARY}",
|
||||
"binproviders": "env,apt,brew"
|
||||
"binproviders": "env,brew,apt"
|
||||
}
|
||||
],
|
||||
"node_binaries": [
|
||||
@ -323,19 +323,19 @@
|
||||
},
|
||||
{
|
||||
"name": "{GH_BINARY}",
|
||||
"binproviders": "env,apt,brew"
|
||||
"binproviders": "env,brew,apt"
|
||||
},
|
||||
{
|
||||
"name": "{GIT_BINARY}",
|
||||
"binproviders": "env,apt,brew"
|
||||
"binproviders": "env,brew,apt"
|
||||
},
|
||||
{
|
||||
"name": "{JQ_BINARY}",
|
||||
"binproviders": "env,apt,brew"
|
||||
"binproviders": "env,brew,apt"
|
||||
},
|
||||
{
|
||||
"name": "{CURL_BINARY}",
|
||||
"binproviders": "env,apt,brew"
|
||||
"binproviders": "env,brew,apt"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@ resolve_docs_binary() {
|
||||
uv run --no-cache --project "$REPO_DIR" --no-sync --no-sources abxpkg env \
|
||||
--install \
|
||||
--lib="$ABXPKG_LIB_DIR" \
|
||||
--binproviders=env,apt,brew \
|
||||
--binproviders=env,brew,apt \
|
||||
"$binary_name" >/dev/null
|
||||
test -L "$ABXPKG_LIB_DIR/env/bin/$binary_name"
|
||||
test -x "$ABXPKG_LIB_DIR/env/bin/$binary_name"
|
||||
|
||||
@ -32,7 +32,7 @@ OUTPUT_DIR="$(pwd)"
|
||||
: "${ABXPKG_LIB_DIR:?Set ABXPKG_LIB_DIR to the ArchiveBox package library directory}"
|
||||
|
||||
for binary in python sqlite3 jq; do
|
||||
abxpkg install "$binary" --lib "$ABXPKG_LIB_DIR" --binproviders env,apt,brew
|
||||
abxpkg install "$binary" --lib "$ABXPKG_LIB_DIR" --binproviders env,brew,apt
|
||||
done
|
||||
|
||||
PYTHON_BINARY="$ABXPKG_LIB_DIR/env/bin/python"
|
||||
|
||||
@ -175,7 +175,7 @@ prepare_abxpkg_environment() {
|
||||
}
|
||||
|
||||
resolve_setup_curl() {
|
||||
resolve_setup_binary curl env,apt,brew true
|
||||
resolve_setup_binary curl env,brew,apt true
|
||||
CURL_BINARY="$ABXPKG_LIB_DIR/env/bin/curl"
|
||||
}
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
"required_binaries": [
|
||||
{
|
||||
"name": "nginx",
|
||||
"binproviders": "env,apt,brew",
|
||||
"binproviders": "env,brew,apt",
|
||||
"min_version": null
|
||||
}
|
||||
]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user