diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6821c5abc..b7029092d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ name: CI on: [push, pull_request] permissions: - contents: write + contents: read env: RUN_TESTS: ALL BUILD_NUMBER: ${{ github.run_number }} @@ -207,7 +207,7 @@ jobs: with: submodules: recursive - name: Install dependencies - run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake vim-common xsdcxx libxml-security-c-dev zlib1g-dev doxygen + run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake xxd xsdcxx libxml-security-c-dev zlib1g-dev doxygen - name: Build docs run: | cmake -B build -S . @@ -231,7 +231,7 @@ jobs: with: submodules: recursive - name: Install dependencies - run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake vim-common xsdcxx libxml-security-c-dev zlib1g-dev curl ca-certificates + run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake xxd xsdcxx libxml-security-c-dev zlib1g-dev curl ca-certificates - name: Download Coverity Build Tool run: | curl --silent --data "token=$TOKEN&project=$PROJECTNAME" -o cov-analysis-linux64.tar.gz https://scan.coverity.com/download/cxx/linux64 diff --git a/prepare_osx_build_environment.sh b/prepare_osx_build_environment.sh index c938fdd40..f36189473 100755 --- a/prepare_osx_build_environment.sh +++ b/prepare_osx_build_environment.sh @@ -5,8 +5,8 @@ XERCES_DIR=xerces-c-3.2.4 XALAN_DIR=xalan_c-1.12 XMLSEC_DIR=xml-security-c-2.0.4 XSD=xsd-4.0.0-i686-macosx -OPENSSL_DIR=openssl-1.1.1q -LIBXML2_DIR=libxml2-2.9.14 +OPENSSL_DIR=openssl-1.1.1s +LIBXML2_DIR=libxml2-2.10.3 ANDROID_NDK=android-ndk-r25 FREETYPE_DIR=freetype-2.10.1 FONTCONFIG_DIR=fontconfig-2.13.1