From 8421b3005414142674bb46f9ba453d92cb3dc113 Mon Sep 17 00:00:00 2001 From: matt335672 <30179339+matt335672@users.noreply.github.com> Date: Thu, 20 Oct 2022 10:15:24 +0100 Subject: [PATCH 1/2] Update github actions to address warnings - Update github actions version for node.js 16 - Update github ::set-output usage --- .github/workflows/build.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 906106e..06881c7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,14 +9,13 @@ jobs: runs-on: ubuntu-latest steps: # Set steps.os.outputs.image to the specific OS (e.g. 'ubuntu20') - # see https://github.com/actions/cache/issues/543 - name: Get operating system name and version. id: os - run: echo "::set-output name=image::$ImageOS" + run: echo "image=$ImageOS" >>$GITHUB_OUTPUT shell: bash - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache pulseaudio source - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: cache-pulseaudio-src with: @@ -44,16 +43,16 @@ jobs: steps: - name: Get operating system name and version. id: os - run: echo "::set-output name=image::$ImageOS" + run: echo "image=$ImageOS" >>$GITHUB_OUTPUT shell: bash - name: Fetch pulseaudio sources - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: cache-pulseaudio-src with: path: ~/pulseaudio.src key: ${{ steps.os.outputs.image }}-build-${{ env.cache-name }} - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - run: sudo apt-get update - run: sudo apt-get -yq install build-essential libpulse-dev - run: ./bootstrap From 8e46b8f7b52132d9b8a8e99f82e516f92ab8da9c Mon Sep 17 00:00:00 2001 From: matt335672 <30179339+matt335672@users.noreply.github.com> Date: Thu, 20 Oct 2022 10:15:24 +0100 Subject: [PATCH 2/2] Fix CI build on github jammy VMs Remove the libunwind-14-dev package before installing the PA build dependencies, as this is incompatible with libunwind-dev --- scripts/install_pulseaudio_sources_apt.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/install_pulseaudio_sources_apt.sh b/scripts/install_pulseaudio_sources_apt.sh index d2cfe6a..5e06c23 100755 --- a/scripts/install_pulseaudio_sources_apt.sh +++ b/scripts/install_pulseaudio_sources_apt.sh @@ -98,6 +98,15 @@ if [ ! -d "$PULSE_DIR" ]; then sudo apt-get update + # For the CI build on 22.04, it was noted that an incompatible + # libunwind development package was installed. + if [ -f /usr/include/libunwind/libunwind.h ]; then + pkg=`dpkg -S /usr/include/libunwind/libunwind.h | sed -e 's/: .*//'` + if [ -n "$pkg" -a "$pkg" != libunwind-dev ]; then + echo "- Removing package $pkg" + sudo apt-get remove "$pkg" + fi + fi sudo apt-get build-dep -y pulseaudio # Install any missing dependencies for this software release case "$RELEASE" in