diff options
| -rw-r--r-- | .github/workflows/ci_appveyor.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ci_github.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ci_travis.yml | 2 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | docs/ci.md | 4 | ||||
| -rw-r--r-- | project/ci/build.py (renamed from project/ci/cmake.py) | 0 | ||||
| -rw-r--r-- | pyproject.toml | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/.github/workflows/ci_appveyor.yml b/.github/workflows/ci_appveyor.yml index b1f5eab..1bd0625 100644 --- a/.github/workflows/ci_appveyor.yml +++ b/.github/workflows/ci_appveyor.yml @@ -48,6 +48,6 @@ jobs: - name: Build Boost run: python -m project.ci.boost --hint AppVeyor -- --with-filesystem - name: Build example project - run: python -m project.ci.cmake --hint AppVeyor --install + run: python -m project.ci.build --hint AppVeyor --install - name: Run example project run: ./.ci/run_foo.ps1 (Join-Path $env:APPVEYOR_BUILD_FOLDER .. build install bin foo) diff --git a/.github/workflows/ci_github.yml b/.github/workflows/ci_github.yml index bcac50c..96a52a2 100644 --- a/.github/workflows/ci_github.yml +++ b/.github/workflows/ci_github.yml @@ -47,6 +47,6 @@ jobs: - name: Build Boost run: python -m project.ci.boost -- --with-filesystem - name: Build example project - run: python -m project.ci.cmake --install --subdir examples/boost + run: python -m project.ci.build --install --subdir examples/boost - name: Run example project run: ./.ci/run_foo.ps1 (Join-Path $env:GITHUB_WORKSPACE .. build install bin foo) diff --git a/.github/workflows/ci_travis.yml b/.github/workflows/ci_travis.yml index 23f0686..256e61c 100644 --- a/.github/workflows/ci_travis.yml +++ b/.github/workflows/ci_travis.yml @@ -46,6 +46,6 @@ jobs: - name: Build Boost run: python -m project.ci.boost --hint Travis -- --with-filesystem - name: Build example project - run: python -m project.ci.cmake --hint Travis --install + run: python -m project.ci.build --hint Travis --install - name: Run example project run: ./.ci/run_foo.ps1 (Join-Path $env:TRAVIS_BUILD_DIR .. build install bin foo) @@ -27,7 +27,7 @@ Installation | boost-build | `python3 -m project.boost.build` | project-build | `python3 -m project.build` | ci-boost | `python3 -m project.ci.boost` - | ci-cmake | `python3 -m project.ci.cmake` + | ci-build | `python3 -m project.ci.build` Toolsets -------- @@ -104,7 +104,7 @@ Everything is optional (use the `CC_*` CMake options to opt out). ### CI -Utility scripts `ci-boost` and `ci-cmake` allow building Boost and CMake +Utility scripts `ci-boost` and `ci-build` allow building Boost and CMake projects on multiple CI systems. They work by calling the generic scripts from above, auto-filling some parameters from environment variables. @@ -120,7 +120,7 @@ parameters from environment variables. | Install path | `$TRAVIS_BUILD_DIR/../build/install` | `%APPVEYOR_BUILD_FOLDER%\..\build\install` | `$GITHUB_WORKSPACE/../build/install` -For an example of how to integrate `ci-boost` and `ci-cmake` into a CI +For an example of how to integrate `ci-boost` and `ci-build` into a CI workflow, see [docs/ci.md](docs/ci.md). Tools @@ -1,4 +1,4 @@ -`ci-boost` and `ci-cmake` are thin wrappers around `boost-download`/`boost-build` +`ci-boost` and `ci-build` are thin wrappers around `boost-download`/`boost-build` and `project-build` accordingly. They work by reading environment variables and passing their values as command line parameters to the more generic scripts. This facilitates matrix-building the project without too much fuss. @@ -18,7 +18,7 @@ env: - CONFIGURATION=Release PLATFORM=x64 before_script: ci-boost -- --with-filesystem -script: ci-cmake --install +script: ci-build --install ``` is roughly equivalent to running diff --git a/project/ci/cmake.py b/project/ci/build.py index 24fe34c..24fe34c 100644 --- a/project/ci/cmake.py +++ b/project/ci/build.py diff --git a/pyproject.toml b/pyproject.toml index 87e8c3c..c6797f5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ classifiers = [ boost-build = "project.boost.build:_main" boost-download = "project.boost.download:_main" ci-boost = "project.ci.boost:main" -ci-cmake = "project.ci.cmake:main" +ci-build = "project.ci.build:main" project-build = "project.build:main" [tool.setuptools] |