Skip to content

Commit 53ae06e

Browse files
committed
- updated fwupd workflows (patching only the latest, master has changed
for bookworm compatibility, read comment in .github/workflows/fwupd.yml for more info); - updated ffmpeg mirror to the github one (the main mirror is unavailable); - disabled vte master testing (c++ features that are not available on debian bookworm), and minor change to verify the linkage against gnutls-wolfssl; - updated dependencies in the rsyslog (new ones were added upstream in the master branch);
1 parent 337a8ce commit 53ae06e

4 files changed

Lines changed: 7 additions & 6 deletions

File tree

.github/workflows/fwupd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
git checkout ${{ matrix.fwupd_ref }}
9999
100100
- name: Patch fwupd tests for Debian Bookworm compatibility
101-
if: matrix.fwupd_ref != '1.9.26'
101+
if: matrix.fwupd_ref != '1.9.26' matrix.fwupd_ref != 'master'
102102
working-directory: fwupd
103103
run: |
104104
# GLib in Debian Bookworm emits WARNING for invalid properties while

.github/workflows/gst-libav1.0.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
- name: Build FFmpeg with GnuTLS & MPEG-4 encoder
109109
run: |
110110
cd $RUNNER_WORKSPACE
111-
git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg-gnutls
111+
git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg-gnutls
112112
cd ffmpeg-gnutls
113113
export PKG_CONFIG_PATH="/opt/gnutls/lib/pkgconfig:/opt/gstreamer/lib/pkgconfig"
114114
export CPPFLAGS="-I/opt/gnutls/include -I/opt/gstreamer/include"

.github/workflows/libvte.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
matrix:
1919
os: [ ubuntu-latest ]
20-
vte_ref: [ 'master', '0.70.6']
20+
vte_ref: [ '0.70.6' ]
2121
fail-fast: false
2222
runs-on: ${{ matrix.os }}
2323
container:
@@ -92,12 +92,12 @@ jobs:
9292
- name: Verify VTE is linked against the custom GnuTLS
9393
working-directory: vte/_build
9494
run: |
95-
lib=$(find src -maxdepth 1 -name 'libvte-2.91*.so*' | head -n 1)
95+
lib=$(find src -maxdepth 1 -type f -name 'libvte-2.91*.so*' | head -n 1)
9696
echo "Checking linkage for $lib"
9797
ldd "$lib" | grep gnutls
9898
if ! ldd "$lib" | grep -q '/opt/gnutls/lib/libgnutls.so'; then
99-
echo "::error::VTE is NOT linked against /opt/gnutls/lib/libgnutls.so"
100-
exit 1
99+
echo "::error::VTE is NOT linked against /opt/gnutls/lib/libgnutls.so"
100+
exit 1
101101
fi
102102
103103
- name: Test VTE build

.github/workflows/rsyslog.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
sudo apt-get install -y build-essential pkg-config libestr-dev libfastjson-dev zlib1g-dev uuid-dev libhiredis-dev uuid-dev flex bison
4747
sudo apt-get install -y libdbi-dev libmariadb-dev-compat postgresql-client libpq-dev libnet-dev librdkafka-dev libpcre3-dev libtokyocabinet-dev libglib2.0-dev libmongo-client-dev
4848
sudo apt-get install -y libcurl4-gnutls-dev
49+
sudo apt-get install -y protobuf-c-compiler libprotobuf-c-dev
4950
apt-get install -y python3-pip
5051
pip3 install --break-system-packages docutils
5152

0 commit comments

Comments
 (0)