Skip to content

Commit 51b8b23

Browse files
MizuxMizux
committed
cleanup
1 parent 4146f7e commit 51b8b23

File tree

13 files changed

+78
-66
lines changed

13 files changed

+78
-66
lines changed

‎.github/workflows/amd64_docker.yml

+22-22
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,28 @@ jobs:
1818
ubuntu
1919
]
2020
fail-fast: false
21-
name: amd64 • ${{ matrix.distro }}
21+
name: amd64•${{ matrix.distro }}
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v4
25-
- name: Check docker
26-
run: |
27-
docker info
28-
docker buildx ls
29-
- name: Build env image
30-
run: make --directory=ci amd64_${{ matrix.distro }}_env
31-
- name: Build devel project
32-
run: make --directory=ci amd64_${{ matrix.distro }}_devel
33-
- name: Build project
34-
run: make --directory=ci amd64_${{ matrix.distro }}_build
35-
- name: Test project
36-
run: make --directory=ci amd64_${{ matrix.distro }}_test
24+
- uses: actions/checkout@v4
25+
- name: Check docker
26+
run: |
27+
docker info
28+
docker buildx ls
29+
- name: Build env image
30+
run: make --directory=ci amd64_${{ matrix.distro }}_env
31+
- name: Build devel project
32+
run: make --directory=ci amd64_${{ matrix.distro }}_devel
33+
- name: Build project
34+
run: make --directory=ci amd64_${{ matrix.distro }}_build
35+
- name: Test project
36+
run: make --directory=ci amd64_${{ matrix.distro }}_test
3737

38-
- name: Build install env image
39-
run: make --directory=ci amd64_${{ matrix.distro }}_install_env
40-
- name: Build install devel project
41-
run: make --directory=ci amd64_${{ matrix.distro }}_install_devel
42-
- name: Build install project
43-
run: make --directory=ci amd64_${{ matrix.distro }}_install_build
44-
- name: Test install project
45-
run: make --directory=ci amd64_${{ matrix.distro }}_install_test
38+
- name: Build install env image
39+
run: make --directory=ci amd64_${{ matrix.distro }}_install_env
40+
- name: Build install devel project
41+
run: make --directory=ci amd64_${{ matrix.distro }}_install_devel
42+
- name: Build install project
43+
run: make --directory=ci amd64_${{ matrix.distro }}_install_build
44+
- name: Test install project
45+
run: make --directory=ci amd64_${{ matrix.distro }}_install_test

‎.github/workflows/amd64_linux.yml

+23-21
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,32 @@ on: [push, pull_request, workflow_dispatch]
77
jobs:
88
native:
99
strategy:
10-
matrix:
11-
cmake: [
12-
{generator: "Unix Makefiles", config: "Release"},
13-
{generator: "Ninja", config: "Release"},
14-
{generator: "Ninja Multi-Config", config: "Release"},
15-
]
16-
python: [
17-
{version: "3.9"},
18-
{version: "3.10"},
19-
{version: "3.11"},
20-
{version: "3.12"},
21-
{version: "3.13"},
22-
]
23-
fail-fast: false
24-
name: Linux•${{ matrix.cmake.generator }}•Py${{ matrix.python.version }}
10+
matrix:
11+
cmake: [
12+
{name: "Make", generator: "Unix Makefiles", config: "Release"},
13+
{name: "Ninja", generator: "Ninja", config: "Release"},
14+
{name: "NinjaMulti", generator: "Ninja Multi-Config", config: "Release"},
15+
]
16+
python: [
17+
{version: "3.9"},
18+
{version: "3.10"},
19+
{version: "3.11"},
20+
{version: "3.12"},
21+
{version: "3.13"},
22+
]
23+
fail-fast: false
24+
name: Linux•${{ matrix.cmake.name }}•Py${{ matrix.python.version }}
2525
runs-on: ubuntu-latest
2626
steps:
2727
- uses: actions/checkout@v4
28+
- name: Setup Python
29+
uses: actions/setup-python@v5
30+
with:
31+
python-version: ${{ matrix.python.version }}
32+
- name: Check Python
33+
run: python --version
34+
- name: Update Path
35+
run: echo "$HOME/.local/bin" >> $GITHUB_PATH
2836
- name: Install Ninja
2937
run: |
3038
sudo apt-get update
@@ -33,12 +41,6 @@ jobs:
3341
run: |
3442
sudo apt install -y swig
3543
swig -version
36-
- name: Setup Python
37-
uses: actions/setup-python@v5
38-
with:
39-
python-version: ${{ matrix.python.version }}
40-
- name: Update Path
41-
run: echo "$HOME/.local/bin" >> $GITHUB_PATH
4244
- name: Check cmake
4345
run: cmake --version
4446
- name: Configure

‎.github/workflows/arm64_docker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
#fedora, # timeout
1515
#opensuse, # timeout
1616
rockylinux,
17-
ubuntu
17+
#ubuntu, # Segmentation fault
1818
]
1919
fail-fast: false
2020
name: arm64 • ${{ matrix.distro }}

‎ci/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ help:
3333
@echo -e "\t\t${BOLD}opensuse${RESET} (tumbleweed)"
3434
@echo -e "\t\t${BOLD}rockylinux${RESET} (9)"
3535
@echo -e "\t\t${BOLD}ubuntu${RESET} (rolling)"
36-
@echo -e "\t\t${BOLD}all${RESET}: trigger ALL DISTROS."
36+
@echo -e "\t\t${BOLD}all${RESET} trigger ALL DISTROS."
3737
@echo
3838
@echo -e "\tWith ${BOLD}<stage>${RESET}:"
3939
@echo -e "\t\t${BOLD}env${RESET}"

‎ci/README.md

+19-12
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ make --directory=ci
2626
```
2727

2828
### Example
29+
2930
For example to test inside an `Alpine` container:
3031
```sh
3132
make alpine_test
@@ -38,6 +39,7 @@ Dockerfile is splitted in several stages.
3839
![docker](docs/deps.svg)
3940

4041
### Run arm64v8 image on amd64 machine
42+
4143
You can build and run `arm64v8` (i.e. `aarch64`) docker container on a `amd64` host (`x86_64`) by enabling qemu support:
4244
```sh
4345
docker run --pull always --rm --privileged multiarch/qemu-user-static --reset -p yes
@@ -51,9 +53,10 @@ docker run --rm -it arm64v8/ubuntu
5153
ref: https://github.com/docker-library/official-images#architectures-other-than-amd64
5254

5355
### Docker buildx
56+
5457
ref: https://docs.docker.com/buildx/working-with-buildx/
5558

56-
On you enable qemu support (see above), you can list available platform using:
59+
Once you enable QEMU support (see above), you can list available platform using:
5760
```sh
5861
docker buildx ls
5962
```
@@ -71,29 +74,33 @@ To control the version of CMake, instead of using the
7174
* Install it using the [pypi package cmake](https://pypi.org/project/cmake/) (need a python stack)
7275

7376
### Install prebuilt
77+
7478
The recommended and faster way is to use the prebuilt version:
79+
7580
```Dockerfile
76-
# Install CMake 3.21.4
77-
RUN wget "https://cmake.org/files/v3.21/cmake-3.21.4-linux-x86_64.sh" \
78-
&& chmod a+x cmake-3.21.4-linux-x86_64.sh \
79-
&& ./cmake-3.21.4-linux-x86_64.sh --prefix=/usr/local/ --skip-license \
80-
&& rm cmake-3.21.4-linux-x86_64.sh
81+
# Install CMake 3.26.4
82+
RUN wget "https://cmake.org/files/v3.26/cmake-3.26.4-linux-x86_64.sh" \
83+
&& chmod a+x cmake-3.26.4-linux-x86_64.sh \
84+
&& ./cmake-3.26.4-linux-x86_64.sh --prefix=/usr/local/ --skip-license \
85+
&& rm cmake-3.26.4-linux-x86_64.sh
8186
```
8287

8388
**warning**: Since [CMake 3.20](https://cmake.org/files/v3.20/) Kitware use a lowercase `linux` instead of `Linux`.
8489

8590
### Build from source
91+
8692
To build from source you can use the following snippet:
93+
8794
```Dockerfile
88-
# Install CMake 3.21.4
89-
RUN wget "https://cmake.org/files/v3.21/cmake-3.21.4.tar.gz" \
90-
&& tar xzf cmake-3.21.4.tar.gz \
91-
&& rm cmake-3.21.4.tar.gz \
92-
&& cd cmake-3.21.4 \
95+
# Install CMake 3.26.4
96+
RUN wget "https://cmake.org/files/v3.26/cmake-3.26.4.tar.gz" \
97+
&& tar xzf cmake-3.26.4.tar.gz \
98+
&& rm cmake-3.26.4.tar.gz \
99+
&& cd cmake-3.26.4 \
93100
&& ./bootstrap --prefix=/usr/local/ \
94101
&& make \
95102
&& make install \
96103
&& cd .. \
97-
&& rm -rf cmake-3.21.4
104+
&& rm -rf cmake-3.26.4
98105
```
99106

‎ci/docker/alpine/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ WORKDIR /home/samples
3838
COPY ci/samples .
3939

4040
FROM install_devel AS install_build
41-
RUN python3 sample.py
41+
RUN python3 -m compileall .
4242

4343
FROM install_build AS install_test
4444
RUN python3 sample.py

‎ci/docker/archlinux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ WORKDIR /home/samples
3939
COPY ci/samples .
4040

4141
FROM install_devel AS install_build
42-
RUN python3 sample.py
42+
RUN python3 -m compileall .
4343

4444
FROM install_build AS install_test
4545
RUN python3 sample.py

‎ci/docker/debian/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ WORKDIR /home/samples
5252
COPY ci/samples .
5353

5454
FROM install_devel AS install_build
55-
RUN python3 sample.py
55+
RUN python3 -m compileall .
5656

5757
FROM install_build AS install_test
5858
RUN python3 sample.py

‎ci/docker/fedora/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ WORKDIR /home/samples
4646
COPY ci/samples .
4747

4848
FROM install_devel AS install_build
49-
RUN python3 sample.py
49+
RUN python3 -m compileall .
5050

5151
FROM install_build AS install_test
5252
RUN python3 sample.py

‎ci/docker/manylinux/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,15 @@ RUN ./build-manylinux.sh test
3131

3232
FROM env AS install_env
3333
COPY --from=build /home/project/build*/python/dist/*.whl ./
34-
RUN python3 -m pip install --find-links=. pythonnative*.whl
34+
RUN python3 -m pip install --find-links=. \
35+
pythonnative*.whl
3536

3637
FROM install_env AS install_devel
3738
WORKDIR /home/sample
3839
COPY ci/samples .
3940

4041
FROM install_devel AS install_build
41-
RUN python3 sample.py
42+
RUN python3 -m compileall .
4243

4344
FROM install_build AS install_test
4445
RUN python3 sample.py

‎ci/docker/opensuse/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ RUN zypper update -y \
1818
RUN zypper update -y \
1919
&& zypper install -y python311 python311-devel \
2020
python311-pip python311-wheel python311-setuptools \
21+
python3-numpy python3-pandas \
2122
&& zypper clean -a
2223
RUN python3.11 -m pip install --break-system-packages \
2324
mypy
@@ -48,7 +49,7 @@ WORKDIR /home/samples
4849
COPY ci/samples .
4950

5051
FROM install_devel AS install_build
51-
RUN python3 sample.py
52+
RUN python3 -m compileall .
5253

5354
FROM install_build AS install_test
5455
RUN python3 sample.py

‎ci/docker/rockylinux/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
4949
# Test install rules
5050
FROM env AS install_env
5151
COPY --from=build /home/project/build/python/dist/*.whl ./
52-
RUN python3 -m pip install --find-links=. pythonnative*.whl
52+
RUN python3 -m pip install --find-links=. \
53+
pythonnative*.whl
5354

5455
FROM install_env AS install_devel
5556
WORKDIR /home/samples

‎ci/docs/generate_image.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
set -eux
2+
set -euxo pipefail
33

44
# Check plantuml is in PATH
55
command -v plantuml

0 commit comments

Comments
 (0)