Skip to content

Commit

Permalink
Merge pull request #954 from libgit2/cmn/bump-libgit2
Browse files Browse the repository at this point in the history
vendor: bump libgit2 to 8f8e805e3f
  • Loading branch information
carlosmn authored Mar 17, 2023
2 parents abf8efa + 8afac4b commit 6379f23
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
fail-fast: false
matrix:
ruby: [ '2.6', '2.7', '3.0', '3.1', '3.2' ]
os: [ ubuntu-18.04 ]
os: [ ubuntu-22.04 ]
runs-on: ${{ matrix.os }}

name: Ruby ${{ matrix.ruby }} on ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion ext/rugged/extconf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def self.run_cmake(timeout, args)
$LDFLAGS << " " + "-L#{Dir.pwd}/deps/winhttp"
$LIBS << " -lwinhttp -lcrypt32 -lrpcrt4 -lole32 -lz -lssh2"
else
pcfile = File.join(LIBGIT2_DIR, "build", "git2.pc")
pcfile = File.join(LIBGIT2_DIR, "build", "libgit2.pc")
$LDFLAGS << " " + `pkg-config --libs --static #{pcfile}`.strip
end
end
Expand Down
3 changes: 3 additions & 0 deletions script/travisbuild
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ HostKey ${SSHD_DIR}/id_rsa
PidFile ${SSHD_DIR}/pid
AuthorizedKeysFile ${HOME}/.ssh/authorized_keys
LogLevel DEBUG
# For now let's accept ssh-rsa so the rest of the setup works
RSAAuthentication yes
HostKeyAlgorithms ssh-rsa
PubkeyAcceptedAlgorithms ssh-rsa
PasswordAuthentication yes
PubkeyAuthentication yes
ChallengeResponseAuthentication no
Expand Down
2 changes: 1 addition & 1 deletion vendor/libgit2
Submodule libgit2 updated 260 files

0 comments on commit 6379f23

Please sign in to comment.