Skip to content

Commit

Permalink
Merge remote-tracking branch 'burstedde/develop' into feature-cmake-u…
Browse files Browse the repository at this point in the history 
…se-system-sc
  • Loading branch information
@sandro-elsweijer
sandro-elsweijer committed Jul 15, 2024
2 parents aca63b3 + d9ec972 commit 5c9bf54
Show file tree
Hide file tree
Showing 32 changed files with 699 additions and 280 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
zlib1g-dev libmpich-dev mpich
- name: Checkout source code
uses: actions/checkout@v4
uses: actions/checkout@main
with:
submodules: true

Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Upload log files
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@main
with:
name: linux_multi1_log
path: |
Expand All @@ -83,7 +83,7 @@ jobs:
zlib1g-dev libmpich-dev mpich
- name: Checkout source code
uses: actions/checkout@v4
uses: actions/checkout@main
with:
submodules: true

Expand All @@ -108,7 +108,7 @@ jobs:
- name: Upload log files
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@main
with:
name: linux_multi2_log
path: |
Expand All @@ -128,7 +128,7 @@ jobs:
zlib1g-dev libmpich-dev mpich
- name: Checkout source code
uses: actions/checkout@v4
uses: actions/checkout@main
with:
submodules: true
fetch-depth: 0
Expand All @@ -139,7 +139,7 @@ jobs:
cd sc
git fetch --tags
git checkout v2.8.6
# git checkout -b test-branch 2c1496904c485d4ca6f844c396b32f608b72438c
# git checkout -b test-branch 91cc8a456bd857dec67cf703afb3b3276aebb016
- name: Run bootstrap script
run: ./bootstrap
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
- name: Upload log files
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@main
with:
name: linux_install_log
path: |
Expand All @@ -189,7 +189,7 @@ jobs:
zlib1g-dev libmpich-dev mpich
- name: Checkout source code
uses: actions/checkout@v4
uses: actions/checkout@main
with:
submodules: true
fetch-depth: 0
Expand All @@ -216,14 +216,14 @@ jobs:
mv p4est-*.tar.gz ..
- name: Upload tarball
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@main
with:
name: p4est_tarball
path: ./p4est-*.tar.gz

- name: Upload log files
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@main
with:
name: linux_tarball_log
path: |
Expand Down
159 changes: 29 additions & 130 deletions .github/workflows/ci_cmake.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,23 @@ on:
types: [published]

env:
CTEST_PARALLEL_LEVEL: 4
CTEST_PARALLEL_LEVEL: 0
CMAKE_BUILD_PARALLEL_LEVEL: 4
CTEST_NO_TESTS_ACTION: "error"
CMAKE_INSTALL_PREFIX: ~/local
CMAKE_PREFIX_PATH: ~/local

jobs:

linux:
runs-on: ubuntu-22.04
name: CMake build on Linux
runs-on: ubuntu-latest
name: Linux mpi=${{ matrix.mpi }} CC=${{ matrix.cc }} shared=${{ matrix.shared }}
timeout-minutes: 60

strategy:
fail-fast: false
matrix:
cc: [gcc-9, gcc-10, gcc-11, gcc-12, gcc-13]
cc: [gcc]
shared: [false]
mpi: [mpich]
include:
Expand All @@ -48,70 +51,25 @@ jobs:
- uses: actions/checkout@v4
name: Checkout source code

- name: Install system dependencies
run: |
sudo apt-get update -yq
sudo apt-get install -yq --no-install-recommends zlib1g-dev lib${{ matrix.mpi }}-dev
- name: Install deps
uses: ./.github/workflows/composite-deps

- name: CMake configure
run: >-
cmake --preset default
--install-prefix=${{ runner.temp }}
-DBUILD_SHARED_LIBS:BOOL=${{ matrix.shared }}
- name: CMake build
run: cmake --build --preset default

- name: CMake self-tests
run: ctest --preset default

- name: install p4est CMake package
run: cmake --install build

# standalone examples tests that CMake packaging is correct
- name: CMake configure examples
run: >-
cmake -B example/build -S example
-DCMAKE_PREFIX_PATH:PATH=${{ runner.temp }}
-DBUILD_SHARED_LIBS:BOOL=${{ matrix.shared }}
- name: CMake build examples
run: cmake --build example/build

- name: Create package
if: github.event.action == 'published'
run: cpack --config build/CPackConfig.cmake
- name: CMake build-test-install-package
uses: ./.github/workflows/composite-unix

- name: Upload package
if: github.event.action == 'published'
uses: actions/upload-artifact@v4
with:
name: linux_binary_archive-${{ matrix.cc }}-${{ matrix.mpi }}-shared-${{ matrix.shared }}
path: build/package
uses: ./.github/workflows/composite-pkg

- name: Upload log files
if: always()
uses: actions/upload-artifact@v4
with:
name: linux_cmake_log-${{ matrix.cc }}-${{ matrix.mpi }}-shared-${{ matrix.shared }}
path: |
./build/CMakeFiles/CMakeConfigureLog.yaml
./build/Testing/Temporary/LastTest.log

mac:
# macos-14 is to use Apple Silicon hardware
# https://github.blog/changelog/2024-01-30-github-actions-introducing-the-new-m1-macos-runner-available-to-open-source/
runs-on: macos-14
name: CMake build on MacOS
runs-on: macos-latest
name: macOS CC=${{ matrix.cc }} shared=${{ matrix.shared }}
timeout-minutes: 60

strategy:
matrix:
cc: [clang, gcc-13]
shared: [false]
include:
- cc: clang
shared: true
cc: [clang]
shared: [false, true]

env:
HOMEBREW_NO_INSTALL_CLEANUP: 1
Expand All @@ -121,62 +79,21 @@ jobs:
- uses: actions/checkout@v4
name: Checkout source code

- name: Install system dependencies
run: brew install open-mpi

- name: CMake configure
run: >-
cmake --preset default
--install-prefix=${{ runner.temp }}
-DBUILD_SHARED_LIBS:BOOL=${{ matrix.shared }}
- name: CMake build
run: cmake --build --preset default

- name: CMake self-tests
run: ctest --preset default

- name: install p4est CMake package
run: cmake --install build

- name: CMake configure examples
run: >-
cmake -B example/build -S example
-DCMAKE_PREFIX_PATH:PATH=${{ runner.temp }}
-DBUILD_SHARED_LIBS:BOOL=${{ matrix.shared }}
- name: Install deps
uses: ./.github/workflows/composite-deps

- name: CMake build examples
run: cmake --build example/build

- name: Create package
if: github.event.action == 'published'
run: cpack --config build/CPackConfig.cmake
- name: CMake build-test-install-package
uses: ./.github/workflows/composite-unix

- name: Upload package
if: github.event.action == 'published'
uses: actions/upload-artifact@v4
with:
name: mac_binary_archive-${{ matrix.cc }}-shared-${{ matrix.shared }}
path: build/package
uses: ./.github/workflows/composite-pkg

- name: Upload log files
if: always()
uses: actions/upload-artifact@v4
with:
name: mac_cmake_log-${{ matrix.cc }}-shared-${{ matrix.shared }}
path: |
./build/CMakeFiles/CMakeConfigureLog.yaml
./build/Testing/Temporary/LastTest.log

windows:
runs-on: windows-latest
name: CMake build on Windows
name: Windows
timeout-minutes: 60

strategy:
matrix:
shared: [false]

env:
CMAKE_GENERATOR: "MinGW Makefiles"

Expand All @@ -193,14 +110,13 @@ jobs:
- uses: actions/checkout@v4
name: Checkout source code

- run: echo "CMAKE_INSTALL_PREFIX=$HOME/local" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
- run: echo "CMAKE_PREFIX_PATH=$HOME/local" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
- run: echo "ZLIB_ROOT=$env:RUNNER_TEMP/msys64/mingw64" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append

# Windows MPI is shaky in general on GitHub Actions, so we don't use it
- name: CMake configure without MPI
run: >-
cmake --preset default
-Dmpi:BOOL=no
--install-prefix=${{ runner.temp }}
-DBUILD_SHARED_LIBS:BOOL=${{ matrix.shared }}
-DZLIB_ROOT:PATH=${{ runner.temp }}/msys64/mingw64/
run: cmake --preset default -Dmpi:BOOL=no

- name: CMake build
run: cmake --build --preset default
Expand All @@ -212,11 +128,7 @@ jobs:
run: cmake --install build

- name: CMake configure examples
run: >-
cmake -B example/build -S example
-DCMAKE_PREFIX_PATH:PATH=${{ runner.temp }}
-DBUILD_SHARED_LIBS:BOOL=${{ matrix.shared }}
-DZLIB_ROOT:PATH=${{ runner.temp }}/msys64/mingw64/
run: cmake -B example/build -S example

- name: CMake build examples
run: cmake --build example/build
Expand All @@ -226,17 +138,4 @@ jobs:
run: cpack --config build/CPackConfig.cmake

- name: Upload package
if: github.event.action == 'published'
uses: actions/upload-artifact@v4
with:
name: windows_binary_archive
path: build/package

- name: Upload log files
if: always()
uses: actions/upload-artifact@v4
with:
name: windows_cmake_log
path: |
./build/CMakeFiles/CMakeConfigureLog.yaml
./build/Testing/Temporary/LastTest.log
uses: ./.github/workflows/composite-pkg
12 changes: 6 additions & 6 deletions .github/workflows/ci_darwin.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ jobs:
steps:
- run: echo "This job is running on a ${{ runner.os }} server hosted by GitHub"

- uses: actions/checkout@v4
- uses: actions/checkout@main
name: Checkout source code
with:
submodules: true

- name: Install system dependencies
run: brew install open-mpi ninja automake
run: brew install open-mpi automake libtool

- name: Run bootstrap script
run: ./bootstrap
Expand All @@ -55,7 +55,7 @@ jobs:
- name: Upload log files
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@main
with:
name: darwin1_log
path: |
Expand All @@ -72,13 +72,13 @@ jobs:
steps:
- run: echo "This job is running on a ${{ runner.os }} server hosted by GitHub"

- uses: actions/checkout@v4
- uses: actions/checkout@main
name: Checkout source code
with:
submodules: true

- name: Install system dependencies
run: brew install open-mpi ninja automake
run: brew install open-mpi automake libtool

- name: Run bootstrap script
run: ./bootstrap
Expand All @@ -94,7 +94,7 @@ jobs:
- name: Upload log files
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@main
with:
name: darwin2_log
path: |
Expand Down
Loading

0 comments on commit 5c9bf54

Please sign in to comment.