Skip to content

Commit 954b022

Browse files
committed
GH Actions: Install Proj.4 via package managers
1 parent 365db58 commit 954b022

File tree

2 files changed

+3
-21
lines changed

2 files changed

+3
-21
lines changed

.github/scripts/install-proj4.sh

-9
This file was deleted.

.github/workflows/build.yml

+3-12
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ jobs:
66
strategy:
77
fail-fast: false
88
matrix:
9-
proj_version: [ 7.2.0 ]
109
compiler: [ gcc, gcc-10, clang ]
1110
steps:
1211
- name: Fetch public key
@@ -18,12 +17,8 @@ jobs:
1817
- name: Update repository
1918
run: sudo apt update
2019
- name: Install packages
21-
run: sudo apt install intel-oneapi-runtime-opencl opencl-c-headers
20+
run: sudo apt install intel-oneapi-runtime-opencl opencl-c-headers libproj-dev
2221
- uses: actions/checkout@v2
23-
- name: Install Proj.4
24-
run: ./.github/scripts/install-proj4.sh
25-
env:
26-
PROJ4_FILE: proj-${{ matrix.proj_version }}
2722
- name: Configure
2823
run: cmake . -DWITH_PROJ=ON
2924
env:
@@ -36,14 +31,10 @@ jobs:
3631
runs-on: macos-10.15
3732
strategy:
3833
fail-fast: false
39-
matrix:
40-
proj_version: [ 7.2.0 ]
4134
steps:
42-
- uses: actions/checkout@v2
4335
- name: Install Proj.4
44-
run: ./.github/scripts/install-proj4.sh
45-
env:
46-
PROJ4_FILE: proj-${{ matrix.proj_version }}
36+
run: brew install proj
37+
- uses: actions/checkout@v2
4738
- name: Configure
4839
run: cmake . -DWITH_PROJ=ON
4940
- name: Make

0 commit comments

Comments
 (0)