Skip to content

Commit

Permalink
create install-dep-proj action, remove Proj from general PDL config
Browse files Browse the repository at this point in the history
  • Loading branch information
mohawk2 committed Dec 3, 2024
1 parent a82472e commit 05755c0
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 5 deletions.
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ RUN apt-get update \
&& apt-add-repository non-free \
&& apt-get update \
&& apt-get install --no-install-recommends -y \
build-essential gfortran libproj-dev \
proj-bin libcfitsio-dev libreadline-dev libvpx-dev libgsl0-dev \
build-essential gfortran \
libcfitsio-dev libreadline-dev libvpx-dev libgsl0-dev \
netpbm libnetpbm10-dev

FROM deps as builder
Expand Down
4 changes: 2 additions & 2 deletions github-actions/install-dep-pdl-dep/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ runs:
if ${{ toJSON( runner.os == 'Linux' ) }}; then
echo "::group::Install main PDL deps (via apt-get)"
sudo apt-get -y update && \
sudo apt-get install --no-install-recommends -y build-essential libproj-dev proj-bin libcfitsio-dev libreadline-dev libvpx-dev libgsl0-dev netpbm libnetpbm10-dev
sudo apt-get install --no-install-recommends -y build-essential libcfitsio-dev libreadline-dev libvpx-dev libgsl0-dev netpbm libnetpbm10-dev
echo "::endgroup::"
elif ${{ toJSON( runner.os == 'macOS' ) }}; then
echo "::group::Install main PDL deps (via brew)"
brew update
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install proj netpbm gsl
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install netpbm gsl
echo "::endgroup::"
fi
- name: Install extra optional main PDL deps
Expand Down
20 changes: 20 additions & 0 deletions github-actions/install-dep-proj/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Install Proj
runs:
using: "composite"
steps:
- name: Install Proj (via apt-get)
shell: bash
run: |
if ${{ toJSON( runner.os == 'Linux' ) }}; then
echo "::group::Install Proj (via apt-get)"
sudo apt-get -y update && sudo apt-get install --no-install-recommends -y libproj-dev proj-bin
echo "::endgroup::"
fi
- name: Install Proj (via brew)
shell: bash
run: |
if ${{ toJSON( runner.os == 'macOS' ) }}; then
echo "::group::Install Proj (via brew)"
brew install proj
echo "::endgroup::"
fi
2 changes: 1 addition & 1 deletion regression-vagrant/install-pdl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
function start() {
perlbrew switch perl-5.14.4
sudo apt-get update
sudo apt-get install -y build-essential libx11-dev pgplot5 libplplot-dev libproj-dev libvpx-dev libxpm-dev proj-bin libcfitsio3-dev libreadline-dev
sudo apt-get install -y build-essential libx11-dev pgplot5 libplplot-dev libvpx-dev libxpm-dev libcfitsio3-dev libreadline-dev
if [ "$DISABLE_FORTRAN" != 1 ]; then sudo apt-get install -y gfortran; fi # set DISABLE_FOTRAN = 1 to not install gfortran
sudo apt-get install -y libxi-dev libxmu-dev freeglut3-dev libgsl0-dev libnetpbm10-dev # for OpenGL
sudo apt-get install -y xvfb # for OpenGL
Expand Down

0 comments on commit 05755c0

Please sign in to comment.