Skip to content

Commit

Permalink
Update to libgit2 1.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jdavid committed May 17, 2024
1 parent b248587 commit 31ea782
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ jobs:
if: runner.os == 'Linux'
run: |
sudo apt install tinyproxy
LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.0 /bin/sh build.sh test
LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.1 /bin/sh build.sh test
- name: macOS
if: runner.os == 'macOS'
run: |
export OPENSSL_PREFIX=`brew --prefix openssl@1.1`
LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.0 /bin/sh build.sh test
LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.1 /bin/sh build.sh test
aarch64:
runs-on: ubuntu-22.04
Expand All @@ -57,7 +57,7 @@ jobs:
apt-get update -q -y
apt-get install -q -y cmake libssl-dev python3-dev python3-venv wget
run: |
LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.0 /bin/sh build.sh test
LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.1 /bin/sh build.sh test
s390x:
runs-on: ubuntu-22.04
Expand All @@ -75,5 +75,5 @@ jobs:
apt-get update -q -y
apt-get install -q -y cmake libssl-dev python3-dev python3-venv wget
run: |
LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.0 /bin/sh build.sh test
LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.1 /bin/sh build.sh test
continue-on-error: true # Tests are expected to fail, see issue #812
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.PHONY: build html

build:
OPENSSL_VERSION=3.1.5 LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.0 sh build.sh
OPENSSL_VERSION=3.1.5 LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.1 sh build.sh

html: build
make -C docs html
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build_script:
# Clone, build and install libgit2
- cmd: |
set LIBGIT2=%APPVEYOR_BUILD_FOLDER%\venv
git clone --depth=1 -b v1.8.0 https://github.com/libgit2/libgit2.git libgit2
git clone --depth=1 -b v1.8.1 https://github.com/libgit2/libgit2.git libgit2
cd libgit2
cmake . -DBUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="%LIBGIT2%" -G "%GENERATOR%"
cmake --build . --target install
Expand Down
8 changes: 4 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
#
# sh build.sh
#
# Build libgit2 1.8.0 (will use libssh2 if available), then build pygit2
# Build libgit2 1.8.1 (will use libssh2 if available), then build pygit2
# inplace:
#
# LIBGIT2_VERSION=1.8.0 sh build.sh
# LIBGIT2_VERSION=1.8.1 sh build.sh
#
# Build libssh2 1.11.0 and libgit2 1.8.0, then build pygit2 inplace:
# Build libssh2 1.11.0 and libgit2 1.8.1, then build pygit2 inplace:
#
# LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.0 sh build.sh
# LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.1 sh build.sh
#
# Build inplace and run the tests:
#
Expand Down
14 changes: 7 additions & 7 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ directory, do:

.. code-block:: sh
$ wget https://github.com/libgit2/libgit2/archive/refs/tags/v1.8.0.tar.gz -O libgit2-1.8.0.tar.gz
$ tar xzf libgit2-1.8.0.tar.gz
$ cd libgit2-1.8.0/
$ wget https://github.com/libgit2/libgit2/archive/refs/tags/v1.8.1.tar.gz -O libgit2-1.8.1.tar.gz
$ tar xzf libgit2-1.8.1.tar.gz
$ cd libgit2-1.8.1/
$ cmake .
$ make
$ sudo make install
Expand Down Expand Up @@ -227,9 +227,9 @@ Install libgit2 (see we define the installation prefix):

.. code-block:: sh
$ wget https://github.com/libgit2/libgit2/archive/refs/tags/v1.8.0.tar.gz -O libgit2-1.8.0.tar.gz
$ tar xzf libgit2-1.8.0.tar.gz
$ cd libgit2-1.8.0/
$ wget https://github.com/libgit2/libgit2/archive/refs/tags/v1.8.1.tar.gz -O libgit2-1.8.1.tar.gz
$ tar xzf libgit2-1.8.1.tar.gz
$ cd libgit2-1.8.1/
$ cmake . -DCMAKE_INSTALL_PREFIX=$LIBGIT2
$ cmake --build . --target install
Expand Down Expand Up @@ -286,7 +286,7 @@ variable. The following recipe shows you how to do it from a bash shell:
.. code-block:: sh
$ export LIBGIT2=C:/Dev/libgit2
$ git clone --depth=1 -b v1.8.0 https://github.com/libgit2/libgit2.git
$ git clone --depth=1 -b v1.8.1 https://github.com/libgit2/libgit2.git
$ cd libgit2
$ cmake . -DCMAKE_INSTALL_PREFIX=$LIBGIT2 -G "Visual Studio 14 Win64"
$ cmake --build . --config release --target install
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ skip = "pp3* *musllinux_aarch64 *musllinux_ppc64le"
archs = ["auto"]
build-frontend = "default"
dependency-versions = "pinned"
environment = {LIBGIT2_VERSION="1.8.0", LIBSSH2_VERSION="1.11.0", OPENSSL_VERSION="3.1.5", LIBGIT2="/project/ci"}
environment = {LIBGIT2_VERSION="1.8.1", LIBSSH2_VERSION="1.11.0", OPENSSL_VERSION="3.1.5", LIBGIT2="/project/ci"}

before-all = "sh build.sh"

Expand All @@ -21,7 +21,7 @@ repair-wheel-command = "LD_LIBRARY_PATH=/project/ci/lib auditwheel repair -w {de

[tool.cibuildwheel.macos]
archs = ["universal2"]
environment = {LIBGIT2_VERSION="1.8.0", LIBSSH2_VERSION="1.11.0", OPENSSL_VERSION="3.1.5", LIBGIT2="/Users/runner/work/pygit2/pygit2/ci"}
environment = {LIBGIT2_VERSION="1.8.1", LIBSSH2_VERSION="1.11.0", OPENSSL_VERSION="3.1.5", LIBGIT2="/Users/runner/work/pygit2/pygit2/ci"}
repair-wheel-command = "DYLD_LIBRARY_PATH=/Users/runner/work/pygit2/pygit2/ci/lib delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}"

[tool.ruff]
Expand Down

0 comments on commit 31ea782

Please sign in to comment.