diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5de1b027e..b4b8a356b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,18 +3,6 @@ name: Ubuntu CI on: [push, pull_request] jobs: - bionic-ci: - runs-on: ubuntu-latest - name: Ubuntu Bionic CI - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Compile and test - id: ci - uses: ignition-tooling/action-ignition-ci@bionic - with: - codecov-enabled: true - doxygen-enabled: true focal-ci: runs-on: ubuntu-latest name: Ubuntu Focal CI @@ -25,8 +13,10 @@ jobs: id: ci uses: ignition-tooling/action-ignition-ci@focal with: - cpplint-enabled: true + codecov-enabled: true cppcheck-enabled: true + cpplint-enabled: true + doxygen-enabled: true jammy-ci: runs-on: ubuntu-latest name: Ubuntu Jammy CI diff --git a/README.md b/README.md index 613afd075..149598516 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Build | Status -- | -- Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-math/branch/ign-math6/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-math) -Ubuntu Bionic | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_math-ci-ign-math6-bionic-amd64)](https://build.osrfoundation.org/job/ignition_math-ci-ign-math6-bionic-amd64) +Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_math-ci-ign-math6-focal-amd64)](https://build.osrfoundation.org/job/ignition_math-ci-ign-math6-focal-amd64) Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_math-ci-ign-math6-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_math-ci-ign-math6-homebrew-amd64) Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_math-ci-ign-math6-windows7-amd64)](https://build.osrfoundation.org/job/ignition_math-ci-ign-math6-windows7-amd64) diff --git a/tutorials/installation.md b/tutorials/installation.md index 5f84fcaad..2f7b43cdf 100644 --- a/tutorials/installation.md +++ b/tutorials/installation.md @@ -114,21 +114,25 @@ The optional Eigen component of Ignition Math requires: ### Ubuntu -1. Clone the repository +1. Install tools ``` - git clone https://github.com/ignitionrobotics/ign-math -b ign-math<#> + sudo apt install -y build-essential cmake g++-8 git gnupg lsb-release wget ``` - Be sure to replace `<#>` with a number value, such as 1 or 2, depending on - which version you need. 2. Install dependencies ``` - export SYSTEM_VERSION=bionic sudo apt -y install \ - $(sort -u $(find . -iname 'packages-'$SYSTEM_VERSION'.apt' -o -iname 'packages.apt') | tr '\n' ' ') + $(sort -u $(find . -iname 'packages-'`lsb_release -cs`'.apt' -o -iname 'packages.apt' | tr '\n' ' ')) ``` -3. Configure and build +3. Clone the repository + ``` + git clone https://github.com/ignitionrobotics/ign-math -b ign-math<#> + ``` + Be sure to replace `<#>` with a number value, such as 1 or 2, depending on + which version you need. + +4. Configure and build ``` cd ign-math mkdir build @@ -137,7 +141,7 @@ The optional Eigen component of Ignition Math requires: make ``` -4. Optionally, install +5. Optionally, install ``` sudo make install ```