Skip to content

Commit

Permalink
CI: consistent ci_*.yml file names
Browse files Browse the repository at this point in the history
  • Loading branch information
HuguesDelorme committed Jan 31, 2025
1 parent 036c8ae commit 57659f3
Show file tree
Hide file tree
Showing 10 changed files with 135 additions and 135 deletions.
37 changes: 37 additions & 0 deletions .github/workflows/ci_linux_arch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Linux Arch x64

on: [push]

jobs:
build-archlinux:
runs-on: ubuntu-latest
name: build-archlinux-qt5

steps:
- name: Checkout
uses: actions/checkout@v2
with:
path: 'mayo'

- name: Setup Podman
run: |
sudo apt update
sudo apt-get -y install podman
podman pull docker.io/library/archlinux:latest
- name: Create container and run build+tests
run: |
{
echo 'FROM archlinux:latest'
echo 'RUN pacman -Syu --noconfirm'
echo 'RUN pacman -Sy --noconfirm make cmake git gcc'
echo 'RUN pacman -Sy --noconfirm qt5-base qt5-svg xcb-util-cursor'
echo 'RUN pacman -Sy --noconfirm opencascade libxi'
echo 'pacman -Sy --noconfirm assimp'
echo 'COPY mayo mayo'
echo 'RUN mkdir /mayo/build'
echo 'WORKDIR /mayo/build'
echo 'RUN cmake .. -DMayo_BuildTests=ON -DMayo_BuildPluginAssimp=ON'
echo 'RUN cmake --build . --parallel --config Release'
} > podmanfile
podman build --tag archlinux-ci -f ./podmanfile
118 changes: 0 additions & 118 deletions .github/workflows/ci_linux_armv7.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Linux Fedora
name: Linux Fedora x64

on: [push]

Expand Down Expand Up @@ -34,11 +34,10 @@ jobs:
echo 'WORKDIR /mayo'
echo 'RUN mkdir build'
echo 'WORKDIR /mayo/build'
echo 'RUN cmake --version'
echo 'RUN cmake .. -DMayo_BuildTests=ON -DMayo_BuildPluginAssimp=ON'
echo 'RUN cmake --build . --config Release'
echo 'RUN Xvfb $DISPLAY -screen 0 1280x1024x24 &'
echo 'RUN sleep 5s'
echo 'RUN ./mayo --runtests'
echo 'RUN cmake --build . --parallel --config Release'
#echo 'RUN Xvfb $DISPLAY -screen 0 1280x1024x24 &'
#echo 'RUN sleep 5s'
#echo 'RUN ./mayo --runtests'
} > podmanfile
podman build --tag fedora40-ci -f ./podmanfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Linux
name: Linux Ubuntu x64/arm64

on: [push]

jobs:
build-linux:
build-ubuntu:
strategy:
matrix:
qt_version_major: [5, 6]
Expand Down
79 changes: 79 additions & 0 deletions .github/workflows/ci_linux_ubuntu_armv7.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: Linux Ubuntu armv7

on: [push]

jobs:
build-ubuntu:
strategy:
matrix:
include:
- arch: armv7
distro: ubuntu22.04

runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Get current branch name
uses: nelonoel/[email protected]

- name: Run Build
uses: uraimo/run-on-arch-action@v2
with:
arch: ${{matrix.arch}}

distro: ${{matrix.distro}}

# Not required, but speeds up builds
githubToken: ${{github.token}}

install: |
apt-get -y update
apt-get -y install xvfb # Needed to run unit tests
apt-get -y install cmake
apt-get -y install git
apt-get -y install g++
apt-get -y install qtbase5-dev libqt5svg5-dev
apt-get -y install libxcb-cursor0 # Dependencies for "xcb" Qt plugin(actually needed for Qt6)
apt-get -y install libocct-data-exchange-dev libocct-draw-dev occt-misc
apt-get -y install libtbb-dev libxi-dev # Dependencies for OpenCascade
apt-get -y install libassimp-dev
env: |
DISPLAY: :0
GIT_BRANCH_NAME: ${{env.BRANCH_NAME}}
RUN_ARCH_NAME: ${{matrix.arch}}
run: |
git clone --quiet https://github.com/fougue/mayo.git
cd mayo
# Fixes "fatal: detected dubious ownership in repository at '/home/runner/work/mayo/mayo'"
git config --global --add safe.directory `realpath $PWD/..`
echo GIT_BRANCH_NAME=$GIT_BRANCH_NAME
git checkout $GIT_BRANCH_NAME
cd ..
mkdir build
cd build
cmake .. -DMayo_BuildTests=ON -DMayo_BuildPluginAssimp=ON
cmake --build . --config Release --parallel `nproc`
#
# Execute Unit Tests
# Note: for some unknown reason unit tests are crashing for armv7(on very first test)
# so just execute them for aarch64
#
if [ $RUN_ARCH_NAME = 'aarch64' ]; then
# Start X11 display server
Xvfb $DISPLAY -screen 0 1280x1024x24 &
sleep 5s
./mayo --runtests
else
echo "NOTE: unit tests skipped, they need to be fixed for this architecture"
fi
5 changes: 3 additions & 2 deletions .github/workflows/ci_macos.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: macOS
name: macOS x64/arm64

on: [push]

Expand All @@ -7,7 +7,8 @@ jobs:
strategy:
matrix:
qt_version_major: [5, 6]
os: [macos-latest-large, macos-latest-xlarge]
os: [macos-latest-xlarge]
#os: [macos-latest-large, macos-latest-xlarge]

runs-on: ${{matrix.os}}
name: build-${{matrix.os}}-qt${{matrix.qt_version_major}}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_macos_conda.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: macOS-conda
name: macOS-conda x64

on: [push]

jobs:
build-macos:
build-macos-conda:
runs-on: macos-latest
name: build-macos-qt5

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_windows.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Windows
name: Windows x64

on: [push]

jobs:
build-windows-msvc:
build-windows:
strategy:
matrix:
include:
Expand Down
6 changes: 4 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -679,8 +679,10 @@ endif() # Mayo_BuildConvCli

add_custom_target(
OtherFiles SOURCES
.github/workflows/ci_linux.yml
.github/workflows/ci_linux_armv7.yml
.github/workflows/ci_linux_arch.yml
.github/workflows/ci_linux_fedora.yml
.github/workflows/ci_linux_ubuntu.yml
.github/workflows/ci_linux_ubuntu_armv7.yml
.github/workflows/ci_macos.yml
.github/workflows/ci_macos_conda.yml
.github/workflows/ci_windows.yml
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div align="center">

[![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)
[![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)
[![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)
[![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)
[![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)
[![Downloads](https://img.shields.io/github/downloads/fougue/mayo/total.svg)](https://github.com/fougue/mayo/releases)
Expand Down

0 comments on commit 57659f3

Please sign in to comment.