From 76189c44a2f656e6623a7d36519e406d488a9ee5 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Fri, 17 Feb 2023 20:22:55 -0500 Subject: [PATCH] Remove custom jpeg library installation for mac build libjpeg development files are on the macos GitHub Actions build image now, and downloading our own version was causing conflicts. --- .github/workflows/main.yml | 5 ----- build-scripts/build-mac | 7 ------- 2 files changed, 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aec50b2c..d64b7996 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -90,11 +90,6 @@ jobs: needs: Prebuild steps: - uses: actions/checkout@v3 - - name: 'Download external libs' - uses: actions/download-artifact@v3 - with: - name: external-libs - path: . - name: 'Mac build and test' run: build-scripts/build-mac AppImage: diff --git a/build-scripts/build-mac b/build-scripts/build-mac index 094de58f..89e2adf4 100755 --- a/build-scripts/build-mac +++ b/build-scripts/build-mac @@ -1,13 +1,6 @@ #!/bin/bash set -ex cd $(dirname $0)/.. -unzip qpdf-external-libs-src.zip -tar xzf external-libs-src/jpegsrc* -cd jpeg-* -./configure -make -k -sudo make install -cd .. cmake -S . -B build -DCI_MODE=1 -DCMAKE_BUILD_TYPE=Release cmake --build build --verbose -j$(sysctl -n hw.ncpu) -- -k (cd build; ctest --verbose)