Commit 76189c44a2f656e6623a7d36519e406d488a9ee5
1 parent
d80b63c3
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.
Showing
2 changed files
with
0 additions
and
12 deletions
.github/workflows/main.yml
| @@ -90,11 +90,6 @@ jobs: | @@ -90,11 +90,6 @@ jobs: | ||
| 90 | needs: Prebuild | 90 | needs: Prebuild |
| 91 | steps: | 91 | steps: |
| 92 | - uses: actions/checkout@v3 | 92 | - uses: actions/checkout@v3 |
| 93 | - - name: 'Download external libs' | ||
| 94 | - uses: actions/download-artifact@v3 | ||
| 95 | - with: | ||
| 96 | - name: external-libs | ||
| 97 | - path: . | ||
| 98 | - name: 'Mac build and test' | 93 | - name: 'Mac build and test' |
| 99 | run: build-scripts/build-mac | 94 | run: build-scripts/build-mac |
| 100 | AppImage: | 95 | AppImage: |
build-scripts/build-mac
| 1 | #!/bin/bash | 1 | #!/bin/bash |
| 2 | set -ex | 2 | set -ex |
| 3 | cd $(dirname $0)/.. | 3 | cd $(dirname $0)/.. |
| 4 | -unzip qpdf-external-libs-src.zip | ||
| 5 | -tar xzf external-libs-src/jpegsrc* | ||
| 6 | -cd jpeg-* | ||
| 7 | -./configure | ||
| 8 | -make -k | ||
| 9 | -sudo make install | ||
| 10 | -cd .. | ||
| 11 | cmake -S . -B build -DCI_MODE=1 -DCMAKE_BUILD_TYPE=Release | 4 | cmake -S . -B build -DCI_MODE=1 -DCMAKE_BUILD_TYPE=Release |
| 12 | cmake --build build --verbose -j$(sysctl -n hw.ncpu) -- -k | 5 | cmake --build build --verbose -j$(sysctl -n hw.ncpu) -- -k |
| 13 | (cd build; ctest --verbose) | 6 | (cd build; ctest --verbose) |