Skip to content

Commit fb199a4

Browse files
committed
Install all dependencies with APT
Obsoletes conda for the Python dependencies. Matplotlib (python3-matplotlib in Ubuntu) does not appear to be needed at the moment. Capitalize the GitHub Action step names for consistency.
1 parent 6b5d0e5 commit fb199a4

File tree

3 files changed

+13
-34
lines changed

3 files changed

+13
-34
lines changed

.dev/docker/make_tests.dockerfile

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,12 @@ RUN mkdir /app
55
COPY ./cbflib /app/cbflib
66

77
RUN apt-get update && \
8-
apt-get install -y build-essential git wget libjpeg-dev m4 automake libpcre2-dev byacc liblzma-dev rsync gfortran libz-dev
9-
10-
RUN mkdir -p ~/miniconda3 && \
11-
wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda3/miniconda.sh && \
12-
bash ~/miniconda3/miniconda.sh -b -u -p /usr/share/miniconda && \
13-
rm ~/miniconda3/miniconda.sh
14-
15-
RUN source /usr/share/miniconda/etc/profile.d/conda.sh && \
16-
conda create -y -n build -c conda-forge python=3.11 python-build && \
17-
conda create -y -n test -c conda-forge python=3.11 numpy matplotlib
8+
apt-get install -y bison build-essential git wget libjpeg-dev m4 automake libpcre2-dev liblzma-dev python3-build python3-dev python3-numpy-dev python3-setuptools python3-venv rsync gfortran libz-dev
189

1910
RUN cd /app/cbflib && \
20-
source /usr/share/miniconda/etc/profile.d/conda.sh && \
21-
conda activate build && \
2211
make all
2312

2413
RUN cd /app/cbflib && \
25-
source /usr/share/miniconda/etc/profile.d/conda.sh && \
26-
conda activate test && \
27-
make tests
14+
make tests 2>&1 | tee test.out
15+
16+
RUN ! grep -a ignored /app/cbflib/test.out

.github/workflows/cmake_ctest.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Cmake build and tests
1+
name: CMake build and tests
22

33
on:
44
push:
@@ -18,14 +18,14 @@ jobs:
1818

1919
steps:
2020
- uses: actions/checkout@v4
21-
- name: install extra dependencies
21+
- name: Install extra dependencies
2222
run: |
2323
sudo apt-get update
2424
sudo apt-get install -y python3-numpy-dev
25-
- name: build
25+
- name: Build
2626
run: |
2727
cmake .
2828
cmake --build . --parallel `nproc`
29-
- name: test
29+
- name: Test
3030
run: |
3131
ctest --parallel `nproc`

.github/workflows/make_tests.yml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,22 @@ on:
1212
schedule:
1313
- cron: '0 20 * * 1' # Monday 20:00 UTC
1414

15-
1615
jobs:
1716
build_test:
18-
1917
runs-on: ubuntu-latest
2018

2119
steps:
2220
- uses: actions/checkout@v4
23-
- name: create conda environments
24-
run: |
25-
conda create -y -n build -c conda-forge python=3.11 python-build
26-
conda create -y -n test -c conda-forge python=3.11 numpy matplotlib
27-
- name: install extra dependencies
21+
- name: Install extra dependencies
2822
run: |
2923
sudo apt-get update
30-
sudo apt-get install -y libjpeg-dev liblzma-dev
31-
- name: build
24+
sudo apt-get install -y libjpeg-dev liblzma-dev python3-build python3-dev python3-numpy-dev
25+
- name: Build
3226
run: |
33-
source /usr/share/miniconda/etc/profile.d/conda.sh
34-
conda activate build
3527
make all
36-
- name: test
28+
- name: Test
3729
run: |
38-
source /usr/share/miniconda/etc/profile.d/conda.sh
39-
conda activate test
4030
make tests 2>&1 | tee test.out
41-
- name : check test output
31+
- name : Check test output
4232
run: |
4333
! grep -a ignored test.out

0 commit comments

Comments
 (0)