Skip to content

Commit

Permalink
PR merge workflows (#4303)
Browse files Browse the repository at this point in the history
* Merge the Test Express workflows into the PR CI

* Split merge request triggers into autotools vs cmake
  • Loading branch information
byrnHDF authored Apr 2, 2024
1 parent 8b5644a commit 2f4e9b1
Show file tree
Hide file tree
Showing 7 changed files with 188 additions and 181 deletions.
33 changes: 30 additions & 3 deletions .github/workflows/autotools.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,24 @@
name: hdf5 dev autools CI
name: hdf5 dev autotools CI

# Controls when the action will run. Triggers the workflow on push or pull request
on:
workflow_call:
workflow_dispatch:
push:
pull_request:
branches: [ develop ]
paths-ignore:
- '.github/CODEOWNERS'
- '.github/FUNDING.yml'
- 'doc/**'
- 'release_docs/**'
- 'ACKNOWLEDGEMENTS'
- 'COPYING**'
- '**.md'

# Using concurrency to cancel any in-progress job or run
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
cancel-in-progress: true

permissions:
contents: read
Expand Down Expand Up @@ -83,10 +99,21 @@ jobs:
with:
build_mode: "production"

call-release-cmake-julia:
call-release-auto-julia:
name: "Autotools Julia Workflows"
uses: ./.github/workflows/julia-auto.yml
with:
build_mode: "production"

call-release-auto-xpr:
name: "Autotools TestExpress Workflows"
uses: ./.github/workflows/testxpr-auto.yml

# workflow-msys2-autotools:
# name: "CMake msys2 Workflows"
# uses: ./.github/workflows/msys2-auto.yml
# with:
# build_mode: "production"
# build_option: "--enable-production"


25 changes: 23 additions & 2 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,23 @@ name: hdf5 dev cmake CI

# Controls when the action will run. Triggers the workflow on push or pull request
on:
workflow_call:
workflow_dispatch:
push:
pull_request:
branches: [ develop ]
paths-ignore:
- '.github/CODEOWNERS'
- '.github/FUNDING.yml'
- 'doc/**'
- 'release_docs/**'
- 'ACKNOWLEDGEMENTS'
- 'COPYING**'
- '**.md'

# Using concurrency to cancel any in-progress job or run
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
cancel-in-progress: true

permissions:
contents: read
Expand Down Expand Up @@ -91,4 +107,9 @@ jobs:
uses: ./.github/workflows/julia-cmake.yml
with:
build_mode: "Release"


call-release-cmake-xpr:
name: "CMake TestExpress Workflows"
uses: ./.github/workflows/testxpr-cmake.yml


45 changes: 0 additions & 45 deletions .github/workflows/main.yml

This file was deleted.

68 changes: 68 additions & 0 deletions .github/workflows/testxpr-auto.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: hdf5 TestExpress Autotools CI

on:
workflow_call:

permissions:
contents: read

jobs:
build_and_test:
strategy:
matrix:
build_mode: ["production", "debug"]
include:
- build_mode: "production"
- build_mode: "debug"

name: "Autotools ${{ matrix.build_mode }} Express Test Workflows"

# Don't run the action if the commit message says to skip CI
if: "!contains(github.event.head_commit.message, 'skip-ci')"

runs-on: ubuntu-latest
steps:
- name: Install Linux Dependencies
run: |
sudo apt-get update
sudo apt-get install ninja-build doxygen graphviz
sudo apt install libssl3 libssl-dev libcurl4 libcurl4-openssl-dev
sudo apt install gcc-12 g++-12 gfortran-12
sudo apt install automake autoconf libtool libtool-bin
sudo apt install libaec0 libaec-dev
echo "CC=gcc-12" >> $GITHUB_ENV
echo "CXX=g++-12" >> $GITHUB_ENV
echo "FC=gfortran-12" >> $GITHUB_ENV
- name: Get Sources
uses: actions/checkout@v4.1.1

- name: Autotools Configure
shell: bash
run: |
sh ./autogen.sh
mkdir "${{ runner.workspace }}/build"
cd "${{ runner.workspace }}/build"
$GITHUB_WORKSPACE/configure \
--enable-build-mode=${{ matrix.build_mode }} \
--enable-shared \
--disable-parallel \
--disable-cxx \
--disable-fortran \
--disable-java \
--with-szlib=yes
- name: Autotools Build
shell: bash
run: |
make -j3
working-directory: ${{ runner.workspace }}/build

- name: Autotools Test
shell: bash
env:
HDF5TestExpress: 0
run: |
cd test
make -j3 check
working-directory: ${{ runner.workspace }}/build
66 changes: 66 additions & 0 deletions .github/workflows/testxpr-cmake.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: hdf5 TestExpress CMake CI

on:
workflow_call:

permissions:
contents: read

jobs:
build_and_test:
strategy:
matrix:
build_mode: ["Release", "Debug"]
include:
- build_mode: "Release"
- build_mode: "Debug"

name: "CMake ${{ matrix.build_mode }} Express Test Workflows"

# Don't run the action if the commit message says to skip CI
if: "!contains(github.event.head_commit.message, 'skip-ci')"

runs-on: ubuntu-latest
steps:
- name: Install Linux Dependencies
run: |
sudo apt-get update
sudo apt-get install ninja-build doxygen graphviz
sudo apt install libssl3 libssl-dev libcurl4 libcurl4-openssl-dev
sudo apt install libaec0 libaec-dev
sudo apt install gcc-12 g++-12 gfortran-12
echo "CC=gcc-12" >> $GITHUB_ENV
echo "CXX=g++-12" >> $GITHUB_ENV
echo "FC=gfortran-12" >> $GITHUB_ENV
- name: Get Sources
uses: actions/checkout@v4.1.1

- name: CMake Configure
shell: bash
run: |
mkdir "${{ runner.workspace }}/build"
cd "${{ runner.workspace }}/build"
cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \
-G Ninja \
-DCMAKE_BUILD_TYPE=${{ matrix.build_mode }} \
-DBUILD_SHARED_LIBS=ON \
-DHDF5_ENABLE_ALL_WARNINGS=ON \
-DHDF5_ENABLE_PARALLEL:BOOL=OFF \
-DHDF5_BUILD_CPP_LIB:BOOL=OFF \
-DHDF5_BUILD_FORTRAN=OFF \
-DHDF5_BUILD_JAVA=OFF \
-DHDF5_BUILD_DOC=OFF \
-DLIBAEC_USE_LOCALCONTENT=OFF \
-DZLIB_USE_LOCALCONTENT=OFF \
-DHDF_TEST_EXPRESS=0 \
$GITHUB_WORKSPACE
- name: CMake Build
run: cmake --build . --parallel 3 --config ${{ matrix.build_mode }}
working-directory: ${{ runner.workspace }}/build

- name: CMake Run Tests
run: ctest . --parallel 2 -C ${{ matrix.build_mode }} -V -R H5TESTXPR
working-directory: ${{ runner.workspace }}/build

Loading

0 comments on commit 2f4e9b1

Please sign in to comment.