From 881b3059e2fdde118fde6c40e8f3db02fe22a9ad Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Wed, 20 Mar 2024 17:43:47 -0400 Subject: [PATCH] prevent libgit2.org 1.8 from breaking absolutely everything --- .../amrdeveloper.github.io/GQL/package.yml | 2 +- projects/apollographql.com/rover/package.yml | 5 +-- projects/astral.sh/uv/package.yml | 38 +++++++++---------- projects/cocogitto.io/package.yml | 2 +- projects/crates.io/bat/package.yml | 5 +-- projects/crates.io/eureka/package.yml | 2 +- projects/crates.io/eza/package.yml | 5 +-- projects/crates.io/git-absorb/package.yml | 2 +- projects/crates.io/git-delta/package.yml | 2 +- projects/crates.io/git-gone/package.yml | 5 +-- projects/crates.io/gitopolis/package.yml | 2 +- projects/crates.io/gitui/package.yml | 2 +- projects/dhruvkb.dev/pls/package.yml | 6 +-- projects/git-cliff.org/package.yml | 5 +-- .../github.com/lu-zero/cargo-c/package.yml | 6 +-- .../mergestat.com/mergestat-lite/package.yml | 2 +- projects/onefetch.dev/package.yml | 2 +- projects/prefix.dev/package.yml | 2 +- projects/rust-lang.org/cargo/package.yml | 2 +- projects/sentry.io/package.yml | 2 +- projects/swift.org/package.yml | 2 +- 21 files changed, 48 insertions(+), 53 deletions(-) diff --git a/projects/amrdeveloper.github.io/GQL/package.yml b/projects/amrdeveloper.github.io/GQL/package.yml index 2bd7d7c4..12ad8da8 100644 --- a/projects/amrdeveloper.github.io/GQL/package.yml +++ b/projects/amrdeveloper.github.io/GQL/package.yml @@ -8,7 +8,7 @@ versions: github: AmrDeveloper/GQL dependencies: - libgit2.org: ^1 + libgit2.org: ~1.7 # links to libgit2.so.1.7 build: dependencies: diff --git a/projects/apollographql.com/rover/package.yml b/projects/apollographql.com/rover/package.yml index 2d86ddd3..fca0892a 100644 --- a/projects/apollographql.com/rover/package.yml +++ b/projects/apollographql.com/rover/package.yml @@ -8,7 +8,7 @@ provides: dependencies: openssl.org: ^1.1 zlib.net: ^1 - libgit2.org: ^1 + libgit2.org: ~1.7 # links to libgit2.so.1.7 versions: github: apollographql/rover @@ -22,8 +22,7 @@ build: linux: gnu.org/make: '*' perl.org: ^5 # openssl mod - script: - cargo install --locked --path . --root {{prefix}} + script: cargo install --locked --path . --root {{prefix}} test: script: diff --git a/projects/astral.sh/uv/package.yml b/projects/astral.sh/uv/package.yml index 5ab1d2f7..9daeb3ca 100644 --- a/projects/astral.sh/uv/package.yml +++ b/projects/astral.sh/uv/package.yml @@ -12,7 +12,7 @@ companions: python.org: '*' dependencies: - libgit2.org: ^1.7 + libgit2.org: ~1.7 # links to libgit2.so.1.7 build: dependencies: @@ -43,21 +43,21 @@ test: return "

Hello, World!

" extname: .py run: - - | - if which flask; then - false - fi - - | - uv venv - source .venv/bin/activate - uv pip install flask - - | - mv $FIXTURE app.py - set -m - flask run & - PID=$! - # otherwise the server may not be ready - - sleep 4 - - test "$(curl 127.0.0.1:5000)" = "

Hello, World!

" - # TODO need to install a signal handler or our build servers could be left with a running flask process - - kill $PID + - | + if which flask; then + false + fi + - | + uv venv + source .venv/bin/activate + uv pip install flask + - | + mv $FIXTURE app.py + set -m + flask run & + PID=$! + # otherwise the server may not be ready + - sleep 4 + - test "$(curl 127.0.0.1:5000)" = "

Hello, World!

" + # TODO need to install a signal handler or our build servers could be left with a running flask process + - kill $PID diff --git a/projects/cocogitto.io/package.yml b/projects/cocogitto.io/package.yml index 804ceead..4e36c110 100644 --- a/projects/cocogitto.io/package.yml +++ b/projects/cocogitto.io/package.yml @@ -10,7 +10,7 @@ versions: strip: /v/ dependencies: - libgit2.org: ^1 + libgit2.org: ~1.7 # links to libgit2.so.1.7 build: dependencies: diff --git a/projects/crates.io/bat/package.yml b/projects/crates.io/bat/package.yml index dd78c975..a8aa1069 100644 --- a/projects/crates.io/bat/package.yml +++ b/projects/crates.io/bat/package.yml @@ -11,14 +11,13 @@ versions: dependencies: zlib.net: ^1 - libgit2.org: ^1 + libgit2.org: ~1.7 # links to libgit2.so.1.7 build: dependencies: rust-lang.org: '>=1.60' rust-lang.org/cargo: '*' - script: - cargo install --locked --path . --root {{prefix}} + script: cargo install --locked --path . --root {{prefix}} test: script: | diff --git a/projects/crates.io/eureka/package.yml b/projects/crates.io/eureka/package.yml index e17ef4fc..f166497a 100644 --- a/projects/crates.io/eureka/package.yml +++ b/projects/crates.io/eureka/package.yml @@ -7,7 +7,7 @@ versions: strip: /^v/ dependencies: - libgit2.org: ^1 + libgit2.org: ~1.7 # links to libgit2.so.1.7 build: dependencies: diff --git a/projects/crates.io/eza/package.yml b/projects/crates.io/eza/package.yml index 84bfdc32..82a6009a 100644 --- a/projects/crates.io/eza/package.yml +++ b/projects/crates.io/eza/package.yml @@ -10,14 +10,13 @@ versions: strip: /v/ dependencies: - libgit2.org: ^1 + libgit2.org: ~1.7 # links to libgit2.so.1.7 build: dependencies: rust-lang.org: '>=1.65' rust-lang.org/cargo: '*' - script: - cargo install --locked --path . --root {{prefix}} + script: cargo install --locked --path . --root {{prefix}} test: script: diff --git a/projects/crates.io/git-absorb/package.yml b/projects/crates.io/git-absorb/package.yml index 64632604..77f42bc4 100644 --- a/projects/crates.io/git-absorb/package.yml +++ b/projects/crates.io/git-absorb/package.yml @@ -10,7 +10,7 @@ versions: strip: /v/ dependencies: - libgit2.org: ^1 + libgit2.org: ~1.7 # links to libgit2.so.1.7 build: dependencies: diff --git a/projects/crates.io/git-delta/package.yml b/projects/crates.io/git-delta/package.yml index 07980802..d6cc89aa 100644 --- a/projects/crates.io/git-delta/package.yml +++ b/projects/crates.io/git-delta/package.yml @@ -9,7 +9,7 @@ versions: github: dandavison/delta/tags dependencies: - libgit2.org: ^1 + libgit2.org: ~1.7 # links to libgit2.so.1.7 darwin: zlib.net: ^1 diff --git a/projects/crates.io/git-gone/package.yml b/projects/crates.io/git-gone/package.yml index 809c24b8..ae6ca748 100644 --- a/projects/crates.io/git-gone/package.yml +++ b/projects/crates.io/git-gone/package.yml @@ -10,14 +10,13 @@ versions: strip: /v/ dependencies: - libgit2.org: ^1.7 + libgit2.org: ~1.7 # links to libgit2.so.1.7 build: dependencies: rust-lang.org: '>=1.65' rust-lang.org/cargo: '*' - script: - cargo install --locked --path . --root {{prefix}} + script: cargo install --locked --path . --root {{prefix}} test: script: diff --git a/projects/crates.io/gitopolis/package.yml b/projects/crates.io/gitopolis/package.yml index 71987cbf..89f3e586 100644 --- a/projects/crates.io/gitopolis/package.yml +++ b/projects/crates.io/gitopolis/package.yml @@ -10,7 +10,7 @@ dependencies: openssl.org: ^1.1 zlib.net: ^1 git-scm.org: ^2 - libgit2.org: ~1.7 + libgit2.org: ~1.7 # links to libgit2.so.1.7 build: dependencies: diff --git a/projects/crates.io/gitui/package.yml b/projects/crates.io/gitui/package.yml index f1e45195..a81aa0a6 100644 --- a/projects/crates.io/gitui/package.yml +++ b/projects/crates.io/gitui/package.yml @@ -13,7 +13,7 @@ dependencies: perl.org: '*' openssl.org: ^1.1 zlib.net: ^1 - libgit2.org: ^1 + libgit2.org: ~1.7 # links to libgit2.so.1.7 build: dependencies: diff --git a/projects/dhruvkb.dev/pls/package.yml b/projects/dhruvkb.dev/pls/package.yml index d2fa1204..f8a084ed 100644 --- a/projects/dhruvkb.dev/pls/package.yml +++ b/projects/dhruvkb.dev/pls/package.yml @@ -10,12 +10,12 @@ versions: - 2023.12.22 dependencies: - libgit2.org: ^1 + libgit2.org: ~1.7 # links to libgit2.so.1.7 build: dependencies: - rust-lang.org: ">=1.65" - rust-lang.org/cargo: "*" + rust-lang.org: '>=1.65' + rust-lang.org/cargo: '*' script: cargo install --locked --path . --root {{prefix}} test: diff --git a/projects/git-cliff.org/package.yml b/projects/git-cliff.org/package.yml index 0339688a..ddcc8cd6 100644 --- a/projects/git-cliff.org/package.yml +++ b/projects/git-cliff.org/package.yml @@ -10,15 +10,14 @@ versions: strip: /v/ dependencies: - libgit2.org: ^1 + libgit2.org: ~1.7 # links to libgit2.so.1.7 build: working-directory: git-cliff dependencies: rust-lang.org: '>=1.65' rust-lang.org/cargo: '*' - script: - cargo install --locked --path . --root {{prefix}} + script: cargo install --locked --path . --root {{prefix}} test: script: diff --git a/projects/github.com/lu-zero/cargo-c/package.yml b/projects/github.com/lu-zero/cargo-c/package.yml index 1a45ee27..b832782b 100644 --- a/projects/github.com/lu-zero/cargo-c/package.yml +++ b/projects/github.com/lu-zero/cargo-c/package.yml @@ -6,7 +6,7 @@ versions: github: lu-zero/cargo-c dependencies: - libgit2.org: '*' + libgit2.org: ~1.7 # links to libgit2.so.1.7 libssh2.org: '*' openssl.org: ^1.1 zlib.net: '*' @@ -21,7 +21,7 @@ build: LIBGIT2_SYS_USE_PKG_CONFIG: 1 LIBSSH2_SYS_USE_PKG_CONFIG: 1 OPENSSL_NO_VENDOR: 1 - OPENSSL_DIR: "{{deps.openssl.org.prefix}}" + OPENSSL_DIR: '{{deps.openssl.org.prefix}}' ARGS: - --root {{prefix}} - --locked @@ -33,4 +33,4 @@ provides: - bin/cargo-cinstall - bin/cargo-ctest -test: cargo-capi --version | grep {{version}} \ No newline at end of file +test: cargo-capi --version | grep {{version}} diff --git a/projects/mergestat.com/mergestat-lite/package.yml b/projects/mergestat.com/mergestat-lite/package.yml index a155e3d7..c6783cfe 100644 --- a/projects/mergestat.com/mergestat-lite/package.yml +++ b/projects/mergestat.com/mergestat-lite/package.yml @@ -14,7 +14,7 @@ build: go.dev: ^1.19 cmake.org: '*' git-scm.org: '*' - libgit2.org: '*' + libgit2.org: ~1.7 # links to libgit2.so.1.7 openssl.org: '*' freedesktop.org/pkg-config: '*' python.org: ^3 diff --git a/projects/onefetch.dev/package.yml b/projects/onefetch.dev/package.yml index a66a0faa..e29a5428 100644 --- a/projects/onefetch.dev/package.yml +++ b/projects/onefetch.dev/package.yml @@ -10,7 +10,7 @@ versions: strip: /v/ dependencies: - libgit2.org: ^1 + libgit2.org: ~1.7 # links to libgit2.so.1.7 build: dependencies: diff --git a/projects/prefix.dev/package.yml b/projects/prefix.dev/package.yml index b45395f9..92ffff34 100644 --- a/projects/prefix.dev/package.yml +++ b/projects/prefix.dev/package.yml @@ -7,7 +7,7 @@ versions: dependencies: openssl.org: ^1.1 - libgit2.org: ^1 + libgit2.org: ~1.7 # links to libgit2.so.1.7 build: dependencies: diff --git a/projects/rust-lang.org/cargo/package.yml b/projects/rust-lang.org/cargo/package.yml index 18098bac..8b5873aa 100644 --- a/projects/rust-lang.org/cargo/package.yml +++ b/projects/rust-lang.org/cargo/package.yml @@ -18,7 +18,7 @@ companions: dependencies: zlib.net: ^1 - libgit2.org: ^1 + libgit2.org: ~1.7 # links to libgit2.so.1.7 curl.se/ca-certs: '*' linux: llvm.org: '*' # FIXME only need the linker actually diff --git a/projects/sentry.io/package.yml b/projects/sentry.io/package.yml index 5b70b220..06c72026 100644 --- a/projects/sentry.io/package.yml +++ b/projects/sentry.io/package.yml @@ -6,7 +6,7 @@ versions: github: getsentry/sentry-cli dependencies: - libgit2.org: ^1.7 + libgit2.org: ~1.7 # links to libgit2.so.1.7 build: dependencies: diff --git a/projects/swift.org/package.yml b/projects/swift.org/package.yml index 2dcf691a..503d12f3 100644 --- a/projects/swift.org/package.yml +++ b/projects/swift.org/package.yml @@ -22,7 +22,7 @@ dependencies: gnu.org/binutils: '*' gnupg.org: ^2 gnome.org/libxml2: '*' - libgit2.org: '*' + libgit2.org: ~1.7 # links to libgit2.so.1.7 curl.se: '*' sqlite.org: ^3