Skip to content

Commit dcd87b4

Browse files
authored
Merge pull request #1043 from GitGuardian/agateau/add-missing-dependency
Add missing dependency
2 parents 82a2486 + 7f68d32 commit dcd87b4

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

.github/workflows/build_release_assets.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,14 @@ jobs:
4646
build_os_packages:
4747
name: Build packages
4848
runs-on: ${{ matrix.os }}
49-
container: ${{ matrix.os == 'ubuntu-22.04' && 'rockylinux/rockylinux:8.8' || null }}
49+
container: ${{ matrix.container }}
5050
strategy:
5151
fail-fast: false
5252
matrix:
5353
include:
5454
- os: ubuntu-22.04
55+
# When building on Linux we use a container to build using an old enough version
56+
container: rockylinux/rockylinux:8
5557
- os: windows-2022
5658
- os: macos-13
5759
arch: x86_64
@@ -84,6 +86,9 @@ jobs:
8486
- name: Install Linux specific dependencies
8587
if: matrix.os == 'ubuntu-22.04'
8688
run: |
89+
# Install latest security updates
90+
yum update -y
91+
8792
# Install necessary packages
8893
yum install -y \
8994
python3.9 \
@@ -268,6 +273,7 @@ jobs:
268273
- debian:stable
269274
- ubuntu:latest
270275
- rockylinux/rockylinux:8.8
276+
- rockylinux/rockylinux:9
271277
- opensuse/leap
272278
# Test a distribution with no deb or rpm support
273279
- clearlinux:latest
@@ -290,11 +296,11 @@ jobs:
290296
dpkg -i packages/*.deb
291297
;;
292298
rockylinux*)
293-
yum install -y git
299+
yum install -y git-core
294300
rpm -i packages/*.rpm
295301
;;
296302
opensuse*)
297-
zypper install -y git
303+
zypper install -y git-core
298304
rpm -i packages/*.rpm
299305
;;
300306
clearlinux*)
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
### Fixed
2+
3+
- Installing ggshield from the release RPM on EL9 failed because of a missing library. This is now fixed (#1036).

scripts/build-os-packages/nfpm.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ contents:
2727
dst: /usr/libexec/ggshield
2828
expand: true
2929

30+
# Required because our bundled Python binary still uses libcrypt.so.1, but
31+
# some distributions ship with libcrypt.so.2 nowadays (see #1036).
32+
# We copy libcrypt.so.1.1.0 and not libcrypt.so.1 because the later is a
33+
# symlink to the former.
34+
- src: /usr/lib64/libcrypt.so.1.1.0
35+
dst: /usr/libexec/ggshield/_internal/libcrypt.so.1
36+
3037
- src: README.md
3138
dst: /usr/share/doc/ggshield/README.md
3239

0 commit comments

Comments
 (0)