Commit a18d37ac authored by Paul Schütze's avatar Paul Schütze
Browse files

Merge branch 'p-remove-macos' into 'master' 

CI: Drop macOS, dactivate performance job

See merge request allpix-squared/allpix-squared!1099
parents 522d14ba d0812e4d

.gitlab-ci.yml

+2 −55
Original line number Diff line number Diff line
@@ -65,15 +65,6 @@ stages: 
        - source etc/scripts/setup_lxplus.sh

        - mkdir -p build/ && cd build/



.macos:

    tags:

        - mac

    variables:

        COMPILER_TYPE: "llvm"

    before_script:

        - source .ci/init_x86_64.sh

        - mkdir -p build/ && cd build/





#######################

# Compilation targets #
@@ -135,15 +126,6 @@ cmp:el9-gcc: 
        - .alma9

        - .compile



cmp:macos-clang:

    extends:

        - .macos

        - .compile

    script:

        - cmake -GNinja -DCMAKE_CXX_FLAGS="-Werror" -DBUILD_ALL_MODULES=ON -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_USE_RELATIVE_PATHS=TRUE ..

        - ninja -k0

        - ninja install





############################

# Format and Lint Checking #
@@ -376,23 +358,6 @@ core:el9-llvm: 
        - job: cmp:el9-llvm

          artifacts: true



# Mac OS

mod:macos-clang:

    extends:

        - .macos

        - .testmod

    needs:

        - job: cmp:macos-clang

          artifacts: true



core:macos-clang:

    extends:

        - .macos

        - .testcore

    needs:

        - job: cmp:macos-clang

          artifacts: true





#####################

# Performance tests #
@@ -410,7 +375,8 @@ core:macos-clang: 
    retry: 1



# CentOS7

perf:cc7-gcc:

# Deactivated due to lack of runners

.perf:cc7-gcc:

    extends:

        - .centos7

        - .testperf
@@ -418,16 +384,6 @@ perf:cc7-gcc: 
        - job: cmp:cc7-gcc

          artifacts: true



# Mac OS

# Temporarily disable Mac OS X performance until tests are adapted to actual performance

.perf:macos-clang:

    extends:

        - .macos

        - .testperf

    needs:

        - job: cmp:macos-clang

          artifacts: true





#############################

# Documentation Compilation #
@@ -529,14 +485,6 @@ pkg:el9-gcc: 
        - job: cmp:el9-gcc

          artifacts: true



pkg:macos-clang:

    extends:

        - .macos

        - .pack

    needs:

        - job: cmp:macos-clang

          artifacts: true





############################

# Documentation Deployment #
@@ -579,7 +527,6 @@ deploy:cvmfs: 
        - pkg:cc7-gcc

        - pkg:el9-llvm

        - pkg:el9-gcc

        - pkg:macos-clang

    tags:

        - cvmfs-deploy

    only:

doc/usermanual/02_installation/08_cvmfs.md

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ used to run Allpix Squared without building it beforehand. Compared to the Docke 
[Section 2.7](./07_docker_images.md), which can run on any operating system, binary releases are tied to a specific operating

system.



Binaries for Allpix Squared are currently provided for CentOS 7 (GCC only), AlmaLinux 9/Red Hat Enterprise Linux 9/EL9 (both in a GCC and LLVM variant) and MacOS.

Binaries for Allpix Squared are currently provided for CentOS 7 (GCC only) and AlmaLinux 9/Red Hat Enterprise Linux 9/EL9 (both in a GCC and LLVM variant).

Details on the deployment process are given in [Setcion 11.4](../11_devtools/04_deployment.md).



To use Allpix Squared from CVMFS, run:

doc/usermanual/11_devtools/03_ci.md

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ found in the `.gitlab/ci` directory. 
all jobs passed.*



The **compilation** stage builds the framework from the source on different platforms. Currently, builds are performed on

CentOS 7, AlmaLinux 9/Red Hat Enterprise Linux 9, and macOS. On Linux type platforms, the framework is compiled with recent versions of GCC and Clang, while

the latest AppleClang is used on macOS. The build is always performed with the default compiler flags enabled for the

project:

CentOS 7 and AlmaLinux 9/Red Hat Enterprise Linux 9. On Linux type platforms, the framework is compiled with recent versions of GCC and Clang.

The build is always performed with the default compiler flags enabled for the project:



```

-pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wconversion

-Wuseless-cast -Wctor-dtor-privacy -Wzero-as-null-pointer-constant