Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
@sgpearse
sgpearse committed Apr 2, 2024
1 parent d25aaf0 commit 458b178
Showing 1 changed file with 34 additions and 267 deletions.
301 changes: 34 additions & 267 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ anchors:
- &current3rdParty "2023-Jun"
- &srcLibID "1iWJtXpRY6kDAq3TyBWXtBIuWTB8oFR6a"
- &ubuntu20LibID "12z0l6Nl2OzJZArrXHOc2Zb4Vj3e0v7V5"
- &ubuntu22LibID "17Uv6wTePyRKfN10Iv00JKzeLc2W43NYk"
- &macOSx86LibID "17w6wUS5NIqUz8_s9zV98jeAjM-muWSfn"
- &macOSM1LibID "14610-_oYbF_qbiO3WoOu0FQhNNvzX6p7"
- &suseLibID "1pvdYktXqFM5_8kNd8lG1TT5-rI8Mspyf"
Expand Down Expand Up @@ -226,44 +225,54 @@ jobs:
make -j6
sudo make install
sudo /opt/local/bin/port -v selfupdate
# CMake
(sudo yes || true) | sudo /opt/local/bin/port install cmake
# clang
# If we run selfupdate on every run, we will update clang on minor revisions, taking 1+ hours to build
# Therefore, skip selfupdate until we know we want a newer version of clang
#sudo /opt/local/bin/port -v selfupdate
#(sudo yes || true) | sudo /opt/local/bin/port install clang-17 +universal
#sudo /opt/local/bin/port select --set clang mp-clang-17
#/opt/local/bin/clang++ -v > clangVersion.txt
# CMake
(sudo yes || true) | sudo /opt/local/bin/port install cmake
no_output_timeout: 45m

- save_cache:
key: macos-deps2
paths:
- /opt/local

#- get_libraries:
# fileName: 2023-Sept-M1.tar.xz
# driveID: *macOSM1LibID
# sudo: sudo

- get_libraries:
fileName: 2023-Sept-M1.tar.xz
driveID: *macOSM1LibID
fileName: 2023-Jun-macOSx86.tar.xz
driveID: *macOSx86LibID
sudo: sudo

- build_vapor:
beforeCompile: export PATH=/opt/local/bin:$PATH; sudo port select --set clang mp-clang-17
#beforeCompile: export PATH=/opt/local/bin:$PATH; sudo port select --set clang mp-clang-17
beforeCompile: export PATH=/opt/local/bin:$PATH; softwareupdate --install-rosetta --agree-to-license; sudo port select --set clang mp-clang-17
compileArgs: |
-DCPACK_BINARY_DRAGNDROP=ON \
-DCMAKE_CXX_COMPILER=clang++ \
-DCMAKE_C_COMPILER=clang \
-DCMAKE_OSX_ARCHITECTURES=x86_64 \
-DBUILD_OSP=OFF \
moveToCommand: ${f/Darwin/DarwinM1}

- run:
name: remove old libraries
command: sudo rm -rf /usr/local/VAPOR-Deps
#- run:
# name: remove old libraries
# command: sudo rm -rf /usr/local/VAPOR-Deps

- get_libraries:
fileName: 2023-Jun-macOSx86.tar.xz
driveID: *macOSx86LibID
sudo: sudo
#- get_libraries:
# fileName: 2023-Jun-macOSx86.tar.xz
# driveID: *macOSx86LibID
# sudo: sudo

- build_vapor:
beforeCompile: export PATH=/opt/local/bin:$PATH; softwareupdate --install-rosetta --agree-to-license; sudo port select --set clang mp-clang-17
Expand Down Expand Up @@ -477,153 +486,6 @@ jobs:
- store_artifacts:
path: /tmp/workspace/installers

build_ubuntu18:
docker:
- image: sgpearse/vapor3-ubuntu18:latest

steps:
- run:
name: install python
command: |
apt-get update
apt-get install -y python3
apt install -y python3-pip
pip3 install --upgrade pip
pip3 install scikit-build command
- run:
name: update cmake
command: |
apt remove -y --purge --auto-remove cmake
apt install -y libssl-dev
apt install -y build-essential git
git clone https://github.com/Kitware/CMake/
cd CMake
./bootstrap && make && make install
- checkout

- run:
name: update 3rd party libraries
command: |
rm -rf /usr/local/VAPOR-Deps/2019-Aug
pip3 install gdown --upgrade
gdown https://drive.google.com/uc?id=1elB8v-UNMzkNmnsJPtxk3cI1zBelJ3Hd
filename="/root/project/2019-Aug-Ubuntu.tar.xz"
tar -xf ${filename} -C /usr/local/VAPOR-Deps
- run:
name: make debug
command: |
cd /root/project/build
cmake \
-DBUILD_TEST_APPS=ON \
-DPYTHONVERSION=3.6 \
-DTHIRD_PARTY_DIR=/usr/local/VAPOR-Deps/2019-Aug \
-DPython_INCLUDE_DIRS=/usr/local/VAPOR-Deps/2019-Aug/include/python3.6m \
..
make -j2 2>&1 | tee /tmp/debugOutput.txt
make clean
- store_artifacts:
path: /tmp/debugOutput.txt

- run:
name: make debug with omp
command: |
cd /root/project/build
cmake \
-DBUILD_TEST_APPS=ON \
-DUSE_OMP=ON -DPYTHONVERSION=3.6 \
-DTHIRD_PARTY_DIR=/usr/local/VAPOR-Deps/2019-Aug \
-DPython_INCLUDE_DIRS=/usr/local/VAPOR-Deps/2019-Aug/include/python3.6m \
..
make -j2 2>&1 | tee /tmp/debugOutputWithOMP.txt
make clean
- store_artifacts:
path: /tmp/debugOutputWithOMP.txt

- run:
name: make release
command: |
cd /root/project/build
cmake \
-DBUILD_TEST_APPS=ON \
-DCMAKE_BUILD_TYPE=Release \
-DPYTHONVERSION=3.6 \
-DTHIRD_PARTY_DIR=/usr/local/VAPOR-Deps/2019-Aug \
-DPython_INCLUDE_DIRS=/usr/local/VAPOR-Deps/2019-Aug/include/python3.6m \
..
make -j2 2>&1 | tee /tmp/releaseOutput.txt
make clean
- store_artifacts:
path: /tmp/releaseOutput.txt

- run:
name: make release with omp
command: |
cd /root/project/build
cmake \
-DBUILD_TEST_APPS=ON \
-DUSE_OMP=ON \
-DPYTHONVERSION=3.6 \
-DTHIRD_PARTY_DIR=/usr/local/VAPOR-Deps/2019-Aug \
-DPython_INCLUDE_DIRS=/usr/local/VAPOR-Deps/2019-Aug/include/python3.6m \
..
make -j2 2>&1 | tee /tmp/releaseOutputWithOMP.txt
- store_artifacts:
path: /tmp/releaseOutputWithOMP.txt

- run:
name: Smoke test
command: |
python3 \
/root/project/test_apps/smokeTests/smokeTests.py \
-testDataRoot=/smokeTestData/smokeTestData \
-binaryRoot=/root/project/build/test_binaries \
-resultsDir=/root/project/test_apps/smokeTests/testResults
- store_artifacts:
path: /root/project/test_apps/smokeTests/testResults

- run:
name: check for Debug warnings
command: |
if grep -q warning /tmp/debugOutput.txt; then
cat /tmp/debugOutput.txt
exit -1
else
exit 0
fi
- run:
name: check for Debug OMP warnings
command: |
if grep -q warning /tmp/debugOutputWithOMP.txt; then
cat /tmp/debugOutput.txt
exit -1
else
exit 0
fi
- run:
name: check for Release warnings
command: |
if grep -q warning /tmp/releaseOutput.txt; then
cat /tmp/releaseOutput.txt
exit -1
else
exit 0
fi
- run:
name: check for Release OMP warnings
command: |
if grep -q warning /tmp/releaseOutputWithOMP.txt; then
cat /tmp/releaseOutput.txt
exit -1
else
exit 0
fi
build_suse_installer:
docker:
- image: opensuse/leap
Expand Down Expand Up @@ -652,7 +514,7 @@ jobs:
at: /
- smoke_tests

build_ubuntu20_installer:
build_linux_installer:
docker:
- image: ubuntu:20.04

Expand Down Expand Up @@ -743,50 +605,6 @@ jobs:
- smoke_tests

build_ubuntu22_installer:
docker:
- image: ubuntu:22.04

steps:
- checkout

- run:
name: acquire prerequisites
command: |
apt update
apt install -y curl
apt install -y xz-utils
apt install -y git
apt install -y g++
apt install -y libomp-dev
apt install -y freeglut3-dev
apt install -y libexpat1-dev
apt install -y libglib2.0-0
apt install -y libdbus-1-3
apt install -y valgrind
apt install -y clang-tidy
apt install -y lsb-release
apt install -y python3-pip
pip3 install gdown
# all for cmake
apt-get update
apt-get install -y gpg wget
wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb
dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
DEBIAN_FRONTEND=noninteractive apt install -y software-properties-common
apt-add-repository -y 'deb https://apt.kitware.com/ubuntu/ focal main'
apt install -y cmake --allow-unauthenticated
- get_libraries:
fileName: 2023-Sept-Ubuntu22.tar.xz
driveID: *ubuntu22LibID

- build_vapor:
moveToCommand: ${f/Linux/Ubuntu22}

test_clang_format:
docker:
- image: ubuntu:20.04
Expand Down Expand Up @@ -969,43 +787,6 @@ jobs:
- store_artifacts:
path: /usr/local/VAPOR-Deps/2023-Sept-Ubuntu.tar.xz

build_ubuntu22_libs:
docker:
- image: ubuntu:22.04

resource_class: xlarge

steps:
- run:
name: acquire prerequisites
command: |
DEBIAN_FRONTEND=noninteractive
apt update
apt install -y xz-utils git curl libomp-dev
git config --global --add safe.directory /tmp/_circleci_local_build_repo
- checkout

- get_libraries:
fileName: 2023-Sept-src.tar.xz
driveID: *srcLibID

- run:
name: build libraries
command: |
chmod 777 /root/project/scripts/build3rdParty.sh
/root/project/scripts/build3rdParty.sh -o Ubuntu
no_output_timeout: 60m

- build_vapor:
moveToCommand: ${f/Linux/Ubuntu20}

- store_artifacts:
path: /tmp/workspace/installers

- store_artifacts:
path: /usr/local/VAPOR-Deps/2023-Sept-Ubuntu.tar.xz

build_macOSx86_libs:
macos:
xcode: "13.4.1"
Expand Down Expand Up @@ -1137,33 +918,23 @@ workflows:
version: 2
build:
jobs:
#- clang-tidy
#- build_ubuntu18
#- build_python_api_ubuntuDebug
#- build_python_api_ubuntu
#- build_python_api_osx
#- test_clang_format
#- build_win10_installer
#- build_macOS_installers
- build_ubuntu20_installer
#- build_ubuntu22_installer
- build_win10_installer
- build_macOS_installers
- build_linux_installer
#- build_suse_installer
#- suse_smoke_tests:
# requires:
# - build_suse_installer
#- build_ubuntu20_libs
#- build_ubuntu22_libs
#- build_macOSx86_libs
#- build_M1_libs
#- build_suse_libs
#- build_windows_libs
#- release_weekly_installers:
# requires:
# - build_win10_installer
# - build_macOS_installers
# - build_ubuntu20_installer
# - build_ubuntu22_installer
# - build_suse_installer
- release_weekly_installers:
requires:
- build_win10_installer
- build_macOS_installers
- build_linux_installer
weekly:
triggers:
- schedule:
Expand All @@ -1172,18 +943,14 @@ workflows:
branches:
only: main
jobs:
- build_suse_installer
- build_ubuntu20_installer
- build_ubuntu22_installer
- build_linux_installer
- build_macOS_installers
- build_win10_installer
#- build_python_api_ubuntu
#- build_python_api_osx
- release_weekly_installers:
requires:
- build_suse_installer
- build_ubuntu20_installer
- build_ubuntu22_installer
- build_linux_installer
- build_macOS_installers
- build_win10_installer
#- build_python_api_ubuntu
Expand Down

0 comments on commit 458b178

Please sign in to comment.