Merge pull request #171 from klippa-app/feature/fix-mac-os-pkg-config

Try to fix MacOS build
klippa-app · May 24, 2024 · c1cf5d8 · c1cf5d8
2 parents ca60183 + cf7660a
commit c1cf5d8
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -34,13 +34,13 @@ jobs:
         run: |
           sudo curl -L https://github.com/bblanchon/pdfium-binaries/releases/download/chromium%2F${{ matrix.pdfium }}/pdfium-linux-x64.tgz -o pdfium-linux-x64.tgz && sudo mkdir /opt/pdfium && sudo tar -C /opt/pdfium -xvf pdfium-linux-x64.tgz
           sudo rm pdfium-linux-x64.tgz
-          sudo cp ./.github/workflows/pdfium.pc /usr/lib/pkgconfig/pdfium.pc
+          sudo cp ./.github/workflows/pdfium.pc /opt/pdfium/pdfium.pc
       - name: Set up PDFium library (MacOS)
         if: matrix.os == 'macos-latest'
         run: |
-          sudo curl -L https://github.com/bblanchon/pdfium-binaries/releases/download/chromium%2F${{ matrix.pdfium }}/pdfium-mac-x64.tgz -o pdfium-mac-x64.tgz && sudo mkdir /opt/pdfium && sudo tar -C /opt/pdfium -xvf pdfium-mac-x64.tgz
-          sudo rm pdfium-mac-x64.tgz
-          sudo cp ./.github/workflows/pdfium.pc /usr/local/lib/pkgconfig/pdfium.pc
+          sudo curl -L https://github.com/bblanchon/pdfium-binaries/releases/download/chromium%2F${{ matrix.pdfium }}/pdfium-mac-arm64.tgz -o pdfium-mac-arm64.tgz && sudo mkdir /opt/pdfium && sudo tar -C /opt/pdfium -xvf pdfium-mac-arm64.tgz
+          sudo rm pdfium-mac-arm64.tgz
+          sudo cp ./.github/workflows/pdfium.pc /opt/pdfium/pdfium.pc
       - name: Set up PDFium library (Windows)
         if: matrix.os == 'windows-latest'
         run: |
@@ -54,11 +54,13 @@ jobs:
         if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
         run: |
           export LD_LIBRARY_PATH="/opt/pdfium/lib"
+          export PKG_CONFIG_PATH="/opt/pdfium"
           go test -timeout 30m `go list ./... | grep -v webassembly` -exec "env DYLD_LIBRARY_PATH=/opt/pdfium/lib" -v
       - name: Test all packages (Linux & MacOS) - Experimental
         if: (matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest') && matrix.pdfium == env.PDFIUM_EXPERIMENTAL_VERSION
         run: |
           export LD_LIBRARY_PATH="/opt/pdfium/lib"
+          export PKG_CONFIG_PATH="/opt/pdfium"
           export IS_EXPERIMENTAL="1"
           go test -timeout 30m `go list ./... | grep -v webassembly` -tags pdfium_experimental -exec "env DYLD_LIBRARY_PATH=/opt/pdfium/lib" -v
       - name: Test all packages (Windows)
@@ -78,6 +80,7 @@ jobs:
         if: matrix.os == 'ubuntu-latest' && matrix.go == env.PDFIUM_EXPERIMENTAL_GO_VERSION && matrix.pdfium == env.PDFIUM_EXPERIMENTAL_VERSION
         run: |
           export LD_LIBRARY_PATH="/opt/pdfium/lib"
+          export PKG_CONFIG_PATH="/opt/pdfium"
           export IS_EXPERIMENTAL="1"
           go test -timeout 30m ./internal/implementation_cgo ./internal/implementation_webassembly -coverprofile=coverage.out -covermode=atomic -tags pdfium_experimental -v
       - name: Archive code coverage results