From b6ee09925b946fa40d0e257fe55cd904a64a374d Mon Sep 17 00:00:00 2001 From: ejurgensen Date: Wed, 29 May 2024 22:48:08 +0200 Subject: [PATCH] [gh-actions] Change dependencies from mxml to libxml2 --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/macos.yml | 8 +------- .github/workflows/ubuntu.yml | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 213a0d35..299dffbb 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -49,7 +49,7 @@ jobs: # uses a compiled language - run: | sudo apt-get update - sudo apt-get install -yq build-essential clang clang-tools git autotools-dev autoconf libtool gettext gawk gperf bison flex libconfuse-dev libunistring-dev libsqlite3-dev libavcodec-dev libavformat-dev libavfilter-dev libswscale-dev libavutil-dev libasound2-dev libmxml-dev libgcrypt20-dev libavahi-client-dev zlib1g-dev libevent-dev libplist-dev libsodium-dev libcurl4-openssl-dev libjson-c-dev libprotobuf-c-dev libpulse-dev libwebsockets-dev libgnutls28-dev + sudo apt-get install -yq build-essential clang clang-tools git autotools-dev autoconf libtool gettext gawk gperf bison flex libconfuse-dev libunistring-dev libsqlite3-dev libavcodec-dev libavformat-dev libavfilter-dev libswscale-dev libavutil-dev libasound2-dev libxml2-dev libgcrypt20-dev libavahi-client-dev zlib1g-dev libevent-dev libplist-dev libsodium-dev libcurl4-openssl-dev libjson-c-dev libprotobuf-c-dev libpulse-dev libwebsockets-dev libgnutls28-dev autoreconf -vi ./configure --enable-lastfm --enable-chromecast scan-build --status-bugs -disable-checker deadcode.DeadStores --exclude src/parsers make diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 3c6f8f2c..f8a10b97 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -38,12 +38,6 @@ jobs: sudo ln -s /usr/local/opt/bison/bin/bison /usr/local/bin/bison sudo ln -s /usr/local/opt/flex/bin/flex /usr/local/bin/flex - - name: Install libmxml - # Homebrew by default comes with libmxml 4, but it isn't compatible with mxml 3 which we need - run: | - wget https://raw.githubusercontent.com/Homebrew/homebrew-core/71bfcd3624ee88eee1e2ea6653753dafd48e7fcf/Formula/lib/libmxml.rb - brew install --build-from-source libmxml.rb - - name: Install libinotify-kqueue # brew does not have libinotify package run: | @@ -76,7 +70,7 @@ jobs: - name: Install other dependencies run: | - brew install libunistring confuse libplist libwebsockets libevent libgcrypt json-c protobuf-c libsodium gnutls pulseaudio openssl + brew install libxml2 libunistring confuse libplist libwebsockets libevent libgcrypt json-c protobuf-c libsodium gnutls pulseaudio openssl - name: Configure # We configure a non-privileged setup, since how to add a "owntone" system diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 6c542634..ddb71bc9 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -27,7 +27,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get install -yq build-essential clang clang-tools git autotools-dev autoconf libtool gettext gawk gperf bison flex libconfuse-dev libunistring-dev libsqlite3-dev libavcodec-dev libavformat-dev libavfilter-dev libswscale-dev libavutil-dev libasound2-dev libmxml-dev libgcrypt20-dev libavahi-client-dev zlib1g-dev libevent-dev libplist-dev libsodium-dev libcurl4-openssl-dev libjson-c-dev libprotobuf-c-dev libpulse-dev libwebsockets-dev libgnutls28-dev + sudo apt-get install -yq build-essential clang clang-tools git autotools-dev autoconf libtool gettext gawk gperf bison flex libconfuse-dev libunistring-dev libsqlite3-dev libavcodec-dev libavformat-dev libavfilter-dev libswscale-dev libavutil-dev libasound2-dev libxml2-dev libgcrypt20-dev libavahi-client-dev zlib1g-dev libevent-dev libplist-dev libsodium-dev libcurl4-openssl-dev libjson-c-dev libprotobuf-c-dev libpulse-dev libwebsockets-dev libgnutls28-dev - name: Build and check run: |