Skip to content

Commit 5684f80

Browse files
committed
Use system libgit2 on Ubuntu 24 / 26
1 parent 2b4561e commit 5684f80

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/R-CMD-check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- {os: windows-latest, r: 'release'}
2323
- {os: windows-latest, r: '4.3'}
2424
- {os: windows-latest, r: '4.2'}
25-
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
25+
- {os: ubuntu-26.04, r: 'devel', http-user-agent: 'release'}
2626
- {os: ubuntu-latest, r: 'release'}
2727
- {os: ubuntu-latest, r: 'oldrel-1'}
2828

.github/workflows/distros.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
distro: [ 'rocky-8', 'rocky-9', 'ubuntu-20.04', 'ubuntu-22.04', 'debian-10', 'debian-11', 'debian-12', 'debian-13', 'debian-14']
20+
distro: [ 'rocky-8', 'rocky-9', 'ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04', 'ubuntu-26.04', 'debian-10', 'debian-11', 'debian-12', 'debian-13', 'debian-14']
2121
#arch: [ 'amd64', 'arm64' ]
2222
arch: [ 'amd64' ]
2323
container:

configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ PKG_TEST_FILE="tools/version.c"
1414
PKG_LIBS="-lgit2"
1515
PKG_CFLAGS=""
1616

17-
# On Ubuntu we use static libgit2+libssh2 to support the ec keys
18-
if test -f "/etc/os-release" && grep -Fq Ubuntu "/etc/os-release"; then
17+
# On Ubuntu 22 use static libgit2+libssh2 to support the ec keys
18+
if test -f "/etc/os-release" && grep -Fq Jammy "/etc/os-release"; then
1919
PREFER_STATIC_LIBGIT2=1
2020
fi
2121

0 commit comments

Comments
 (0)