Skip to content

Commit 6379f23

Browse files
authored
Merge pull request #954 from libgit2/cmn/bump-libgit2
vendor: bump libgit2 to 8f8e805e3f
2 parents abf8efa + 8afac4b commit 6379f23

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
fail-fast: false
3939
matrix:
4040
ruby: [ '2.6', '2.7', '3.0', '3.1', '3.2' ]
41-
os: [ ubuntu-18.04 ]
41+
os: [ ubuntu-22.04 ]
4242
runs-on: ${{ matrix.os }}
4343

4444
name: Ruby ${{ matrix.ruby }} on ${{ matrix.os }}

ext/rugged/extconf.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def self.run_cmake(timeout, args)
116116
$LDFLAGS << " " + "-L#{Dir.pwd}/deps/winhttp"
117117
$LIBS << " -lwinhttp -lcrypt32 -lrpcrt4 -lole32 -lz -lssh2"
118118
else
119-
pcfile = File.join(LIBGIT2_DIR, "build", "git2.pc")
119+
pcfile = File.join(LIBGIT2_DIR, "build", "libgit2.pc")
120120
$LDFLAGS << " " + `pkg-config --libs --static #{pcfile}`.strip
121121
end
122122
end

script/travisbuild

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ HostKey ${SSHD_DIR}/id_rsa
1515
PidFile ${SSHD_DIR}/pid
1616
AuthorizedKeysFile ${HOME}/.ssh/authorized_keys
1717
LogLevel DEBUG
18+
# For now let's accept ssh-rsa so the rest of the setup works
1819
RSAAuthentication yes
20+
HostKeyAlgorithms ssh-rsa
21+
PubkeyAcceptedAlgorithms ssh-rsa
1922
PasswordAuthentication yes
2023
PubkeyAuthentication yes
2124
ChallengeResponseAuthentication no

vendor/libgit2

Submodule libgit2 updated 260 files

0 commit comments

Comments
 (0)