Skip to content

Commit aeafd3e

Browse files
HuguesDelormeHuguesDelorme
committed
CI: consistent ci_*.yml file names
1 parent 036c8ae commit aeafd3e

File tree

10 files changed

+132
-132
lines changed

10 files changed

+132
-132
lines changed

‎.github/workflows/ci_linux_arch.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Linux Arch x64
2+
3+
on: [push]
4+
5+
jobs:
6+
build-archlinux:
7+
runs-on: ubuntu-latest
8+
name: build-archlinux-qt5
9+
10+
steps:
11+
- name: Checkout
12+
uses: actions/checkout@v2
13+
with:
14+
path: 'mayo'
15+
16+
- name: Setup Podman
17+
run: |
18+
sudo apt update
19+
sudo apt-get -y install podman
20+
podman pull docker.io/library/archlinux:latest
21+
22+
- name: Create container and run build+tests
23+
run: |
24+
{
25+
echo 'FROM archlinux:latest'
26+
echo 'RUN pacman -Syu --noconfirm'
27+
echo 'RUN pacman -Sy --noconfirm make cmake git gcc'
28+
echo 'RUN pacman -Sy --noconfirm qt5-base qt5-svg xcb-util-cursor'
29+
echo 'RUN pacman -Sy --noconfirm opencascade libxi'
30+
echo 'pacman -Sy --noconfirm assimp'
31+
echo 'COPY mayo mayo'
32+
echo 'RUN mkdir /mayo/build'
33+
echo 'WORKDIR /mayo/build'
34+
echo 'RUN cmake .. -DMayo_BuildTests=ON -DMayo_BuildPluginAssimp=ON'
35+
echo 'RUN cmake --build . --parallel --config Release'
36+
} > podmanfile
37+
podman build --tag archlinux-ci -f ./podmanfile

‎.github/workflows/ci_linux_armv7.yml‎

Lines changed: 0 additions & 118 deletions
This file was deleted.

.github/workflows/ci_fedora.yml renamed to .github/workflows/ci_linux_fedora.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Linux Fedora
1+
name: Linux Fedora x64
22

33
on: [push]
44

@@ -34,11 +34,10 @@ jobs:
3434
echo 'WORKDIR /mayo'
3535
echo 'RUN mkdir build'
3636
echo 'WORKDIR /mayo/build'
37-
echo 'RUN cmake --version'
3837
echo 'RUN cmake .. -DMayo_BuildTests=ON -DMayo_BuildPluginAssimp=ON'
39-
echo 'RUN cmake --build . --config Release'
40-
echo 'RUN Xvfb $DISPLAY -screen 0 1280x1024x24 &'
41-
echo 'RUN sleep 5s'
42-
echo 'RUN ./mayo --runtests'
38+
echo 'RUN cmake --build . --parallel --config Release'
39+
#echo 'RUN Xvfb $DISPLAY -screen 0 1280x1024x24 &'
40+
#echo 'RUN sleep 5s'
41+
#echo 'RUN ./mayo --runtests'
4342
} > podmanfile
4443
podman build --tag fedora40-ci -f ./podmanfile

.github/workflows/ci_linux.yml renamed to .github/workflows/ci_linux_ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Linux
1+
name: Linux Ubuntu x64/arm64
22

33
on: [push]
44

‎.github/workflows/ci_linux_ubuntu_armv7.yml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: Linux Ubuntu armv7
2+
3+
on: [push]
4+
5+
jobs:
6+
build-linux-armv7:
7+
strategy:
8+
matrix:
9+
include:
10+
- arch: armv7
11+
distro: ubuntu
12+
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v2
18+
19+
- name: Get current branch name
20+
uses: nelonoel/branch-name@v1.0.1
21+
22+
- name: Run Build
23+
uses: uraimo/run-on-arch-action@v2
24+
with:
25+
arch: ${{matrix.arch}}
26+
27+
distro: ${{matrix.distro}}
28+
29+
# Not required, but speeds up builds
30+
githubToken: ${{github.token}}
31+
32+
install: |
33+
apt-get -y update
34+
apt-get -y install xvfb # Needed to run unit tests
35+
apt-get -y install cmake
36+
apt-get -y install git
37+
apt-get -y install g++
38+
apt-get -y install qtbase5-dev libqt5svg5-dev
39+
apt-get -y install libxcb-cursor0 # Dependencies for "xcb" Qt plugin(actually needed for Qt6)
40+
apt-get -y install libocct-data-exchange-dev libocct-draw-dev occt-misc
41+
apt-get -y install libtbb-dev libxi-dev # Dependencies for OpenCascade
42+
apt-get -y install libassimp-dev
43+
44+
env: |
45+
DISPLAY: :0
46+
GIT_BRANCH_NAME: ${{env.BRANCH_NAME}}
47+
RUN_ARCH_NAME: ${{matrix.arch}}
48+
49+
run: |
50+
git clone --quiet https://github.com/fougue/mayo.git
51+
cd mayo
52+
53+
# Fixes "fatal: detected dubious ownership in repository at '/home/runner/work/mayo/mayo'"
54+
git config --global --add safe.directory `realpath $PWD/..`
55+
56+
echo GIT_BRANCH_NAME=$GIT_BRANCH_NAME
57+
git checkout $GIT_BRANCH_NAME
58+
cd ..
59+
mkdir build
60+
cd build
61+
62+
cmake .. -DMayo_BuildTests=ON -DMayo_BuildPluginAssimp=ON
63+
cmake --build . --config Release --parallel `nproc`
64+
65+
#
66+
# Execute Unit Tests
67+
# Note: for some unknown reason unit tests are crashing for armv7(on very first test)
68+
# so just execute them for aarch64
69+
#
70+
if [ $RUN_ARCH_NAME = 'aarch64' ]; then
71+
72+
# Start X11 display server
73+
Xvfb $DISPLAY -screen 0 1280x1024x24 &
74+
sleep 5s
75+
./mayo --runtests
76+
77+
else
78+
echo "NOTE: unit tests skipped, they need to be fixed for this architecture"
79+
fi

‎.github/workflows/ci_macos.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: macOS
1+
name: macOS x64/arm64
22

33
on: [push]
44

@@ -7,7 +7,8 @@ jobs:
77
strategy:
88
matrix:
99
qt_version_major: [5, 6]
10-
os: [macos-latest-large, macos-latest-xlarge]
10+
os: [macos-latest-xlarge]
11+
#os: [macos-latest-large, macos-latest-xlarge]
1112

1213
runs-on: ${{matrix.os}}
1314
name: build-${{matrix.os}}-qt${{matrix.qt_version_major}}

‎.github/workflows/ci_macos_conda.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: macOS-conda
1+
name: macOS-conda x64
22

33
on: [push]
44

‎.github/workflows/ci_windows.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Windows
1+
name: Windows x64
22

33
on: [push]
44

‎CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -679,8 +679,10 @@ endif() # Mayo_BuildConvCli
679679

680680
add_custom_target(
681681
OtherFiles SOURCES
682-
.github/workflows/ci_linux.yml
683-
.github/workflows/ci_linux_armv7.yml
682+
.github/workflows/ci_linux_arch.yml
683+
.github/workflows/ci_linux_fedora.yml
684+
.github/workflows/ci_linux_ubuntu.yml
685+
.github/workflows/ci_linux_ubuntu_armv7.yml
684686
.github/workflows/ci_macos.yml
685687
.github/workflows/ci_macos_conda.yml
686688
.github/workflows/ci_windows.yml

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div align="center">
22

33
[![Windows CI](https://github.com/fougue/mayo/actions/workflows/ci_windows.yml/badge.svg?branch=develop)](https://github.com/fougue/mayo/actions/workflows/ci_windows.yml)
4-
[![Linux CI](https://github.com/fougue/mayo/actions/workflows/ci_linux.yml/badge.svg?branch=develop)](https://github.com/fougue/mayo/actions/workflows/ci_linux.yml)
4+
[![Linux CI](https://github.com/fougue/mayo/actions/workflows/ci_linux_ubuntu.yml/badge.svg?branch=develop)](https://github.com/fougue/mayo/actions/workflows/ci_linux_ubuntu.yml)
55
[![macOS CI](https://github.com/fougue/mayo/actions/workflows/ci_macos.yml/badge.svg?branch=develop)](https://github.com/fougue/mayo/actions/workflows/ci_macos.yml)
66
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/d51f8ca6fea34886b8308ff0246172ce)](https://app.codacy.com/gh/fougue/mayo/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
77
[![Downloads](https://img.shields.io/github/downloads/fougue/mayo/total.svg)](https://github.com/fougue/mayo/releases)

0 commit comments

Comments
 (0)