Skip to content

Commit b44040d

Browse files
committed
create install-dep-gsl action, remove GSL from general PDL config
1 parent 529947c commit b44040d

4 files changed

Lines changed: 24 additions & 4 deletions

File tree

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN apt-get update \
2020
&& apt-get update \
2121
&& apt-get install --no-install-recommends -y \
2222
build-essential gfortran \
23-
libcfitsio-dev libreadline-dev libvpx-dev libgsl0-dev \
23+
libcfitsio-dev libreadline-dev libvpx-dev \
2424
netpbm libnetpbm10-dev
2525

2626
FROM deps as builder
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Install GSL
2+
runs:
3+
using: "composite"
4+
steps:
5+
- name: Install GSL (via apt-get)
6+
shell: bash
7+
run: |
8+
if ${{ toJSON( runner.os == 'Linux' ) }}; then
9+
echo "::group::Install GSL (via apt-get)"
10+
sudo apt-get -y update && sudo apt-get install --no-install-recommends -y libgsl0-dev
11+
echo "::endgroup::"
12+
fi
13+
- name: Install GSL (via brew)
14+
shell: bash
15+
run: |
16+
if ${{ toJSON( runner.os == 'macOS' ) }}; then
17+
echo "::group::Install GSL (via brew)"
18+
brew install gsl
19+
echo "::endgroup::"
20+
fi

github-actions/install-dep-pdl-dep/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ runs:
88
if ${{ toJSON( runner.os == 'Linux' ) }}; then
99
echo "::group::Install main PDL deps (via apt-get)"
1010
sudo apt-get -y update && \
11-
sudo apt-get install --no-install-recommends -y build-essential libcfitsio-dev libreadline-dev libvpx-dev libgsl0-dev netpbm libnetpbm10-dev
11+
sudo apt-get install --no-install-recommends -y build-essential libcfitsio-dev libreadline-dev libvpx-dev netpbm libnetpbm10-dev
1212
echo "::endgroup::"
1313
elif ${{ toJSON( runner.os == 'macOS' ) }}; then
1414
echo "::group::Install main PDL deps (via brew)"
1515
brew update
16-
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install netpbm gsl
16+
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install netpbm
1717
echo "::endgroup::"
1818
fi
1919
- name: Install extra optional main PDL deps

regression-vagrant/install-pdl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ function start() {
66
sudo apt-get update
77
sudo apt-get install -y build-essential libx11-dev pgplot5 libplplot-dev libvpx-dev libxpm-dev libcfitsio3-dev libreadline-dev
88
if [ "$DISABLE_FORTRAN" != 1 ]; then sudo apt-get install -y gfortran; fi # set DISABLE_FOTRAN = 1 to not install gfortran
9-
sudo apt-get install -y libxi-dev libxmu-dev freeglut3-dev libgsl0-dev libnetpbm10-dev # for OpenGL
9+
sudo apt-get install -y libxi-dev libxmu-dev freeglut3-dev libnetpbm10-dev # for OpenGL
1010
sudo apt-get install -y xvfb # for OpenGL
1111
export PGPLOT_DEV=/NULL
1212
cpanm --installdeps PDL || ( cat ~/.cpanm/build.log && false )

0 commit comments

Comments
 (0)