Skip to content

Commit

Permalink
create install-dep-gsl action, remove GSL from general PDL config
Browse files Browse the repository at this point in the history
  • Loading branch information
mohawk2 committed Dec 9, 2024
1 parent 529947c commit b44040d
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN apt-get update \
&& apt-get update \
&& apt-get install --no-install-recommends -y \
build-essential gfortran \
libcfitsio-dev libreadline-dev libvpx-dev libgsl0-dev \
libcfitsio-dev libreadline-dev libvpx-dev \
netpbm libnetpbm10-dev

FROM deps as builder
Expand Down
20 changes: 20 additions & 0 deletions github-actions/install-dep-gsl/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Install GSL
runs:
using: "composite"
steps:
- name: Install GSL (via apt-get)
shell: bash
run: |
if ${{ toJSON( runner.os == 'Linux' ) }}; then
echo "::group::Install GSL (via apt-get)"
sudo apt-get -y update && sudo apt-get install --no-install-recommends -y libgsl0-dev

Check warning on line 10 in github-actions/install-dep-gsl/action.yml

View workflow job for this annotation

GitHub Actions / ci

10:81 [line-length] line too long (97 > 80 characters)
echo "::endgroup::"
fi
- name: Install GSL (via brew)
shell: bash
run: |
if ${{ toJSON( runner.os == 'macOS' ) }}; then
echo "::group::Install GSL (via brew)"
brew install gsl
echo "::endgroup::"
fi
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 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 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 netpbm gsl
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install netpbm
echo "::endgroup::"
fi
- name: Install extra optional main PDL deps
Expand Down
2 changes: 1 addition & 1 deletion regression-vagrant/install-pdl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function start() {
sudo apt-get update
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 libxi-dev libxmu-dev freeglut3-dev libnetpbm10-dev # for OpenGL
sudo apt-get install -y xvfb # for OpenGL
export PGPLOT_DEV=/NULL
cpanm --installdeps PDL || ( cat ~/.cpanm/build.log && false )
Expand Down

0 comments on commit b44040d

Please sign in to comment.