Skip to content

Commit

Permalink
ci: combine build and test jobs to one monolithic job matrix
Browse files Browse the repository at this point in the history
the idea is to avoid potential variation in macOS runners and to
speed things up a bit by avoiding rebuilds and artifact upload/download
  • Loading branch information
c-dilks committed Apr 12, 2024
1 parent 2c30ee7 commit d3384d1
Show file tree
Hide file tree
Showing 8 changed files with 123 additions and 344 deletions.
4 changes: 2 additions & 2 deletions .github/test-consumer-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ tool=$1

# source, build, and install directories
source_dir=examples/build_with_$tool
build_dir=build-consumer
install_dir=install-consumer
build_dir=build-consumer-$tool
install_dir=install-consumer-$tool
mkdir -p $install_dir
install_dir=$(cd $install_dir && pwd -P)

Expand Down
435 changes: 114 additions & 321 deletions .github/workflows/ci.yml

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@ jobs:
with:
id: macOS
runner: macos-latest
test_matrix: >-
{
"include": [
{ "mode": "test", "build_id": "cpp-gcc-release", "CC": "gcc", "CXX": "g++", "buildtype": "release" },
{ "mode": "noROOT", "build_id": "cpp-gcc-release-noROOT", "CC": "gcc", "CXX": "g++", "buildtype": "release" }
]
}

issue_bot:
name: Issue bot
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/minver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@ jobs:
runner: ubuntu-latest
container: archlinux/archlinux:latest
verset: minver
test_matrix: >-
{
"include": [
{ "mode": "test", "build_id": "cpp-gcc-release", "CC": "gcc", "CXX": "g++", "buildtype": "release" },
{ "mode": "noROOT", "build_id": "cpp-gcc-release-noROOT", "CC": "gcc", "CXX": "g++", "buildtype": "release" }
]
}

issue_bot:
name: Issue bot
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,18 @@ Iguana is not a framework for _reading_ data, rather it is a set of algorithms t
## Documentation

### For Users
1. [Setup Guide](doc/setup.md)
1. [Examples](examples/README.md)
1. [Troubleshooting](doc/troubleshooting.md)
1. [Design Notes](doc/design.md)
1. [API documentation](https://jeffersonlab.github.io/iguana/doxygen)

### For Developers
1. [Design Notes](doc/design.md)
1. [Developing a new Algorithm](src/iguana/algorithms/example/README.md)
1. [Algorithm Tests and Validators](doc/testing.md)
1. [Repository Maintenance](doc/maintenance.md)
1. [Building for `cvmfs` or `ifarm`](doc/ifarm.md)

## Status
1. [Coverage Report](https://jeffersonlab.github.io/iguana/coverage-report)
4 changes: 2 additions & 2 deletions meson/ifarm/README.md → doc/ifarm.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ meson/resolve-dependencies.py --help # prints the usage guide
## Build

Replace anything in `<angle brackets>` with the appropriate string; you may run these commands from any directory,
preferably outside the source tree. The set of preferred options for `ifarm` builds is contained in [`ifarm.ini`](ifarm.ini), which may be passed to `meson` as a "native file".
preferably outside the source tree. The set of preferred options for `ifarm` builds is contained in [`ifarm.ini`](/meson/native-files/ifarm.ini), which may be passed to `meson` as a "native file".

```bash
meson setup <build_directory> <source_directory> <build_options_from_resolve_dependencies> --native-file=<source_directory>/ifarm/ifarm.ini
meson setup <build_directory> <source_directory> <build_options_from_resolve_dependencies> --native-file=<source_directory>/meson/native-files/ifarm.ini
meson configure <build_directory> --prefix=<absolute_path_to_installation_destination>
meson install -C <build_directory>
```
Expand Down
4 changes: 0 additions & 4 deletions doc/maintenance.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ If the source code was obtained from a release tarball from GitHub, the `.git/`

Because of the fragility of version detection, we try to keep at least the _major_ version correct in the fallback version number of the version detection implementation.

## Building for `ifarm` or `cvmfs` Common Installation

See [its documentation](/meson/ifarm/README.md).

## Python Binding Dependencies

Keep the Python binding dependency versions reasonably up to date in the corresponding `requirements.txt` file:
Expand Down
File renamed without changes.

0 comments on commit d3384d1

Please sign in to comment.