From 7e129d2abd52df354e89717668e5d65a99930689 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 11 Mar 2022 11:17:01 -0800 Subject: [PATCH 1/2] Remove Bionic from future releases (Garden+) Signed-off-by: Louise Poubel --- .github/workflows/ci.yml | 13 ++----------- README.md | 2 +- docker/README.md | 10 ++-------- tutorials/install.md | 12 +++--------- 4 files changed, 8 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e36175c3a2..da0b5b6f2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,17 +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 focal-ci: runs-on: ubuntu-latest name: Ubuntu Focal CI @@ -23,3 +12,5 @@ jobs: - name: Compile and test id: ci uses: ignition-tooling/action-ignition-ci@focal + with: + codecov-enabled: true diff --git a/README.md b/README.md index 1d9203516f..ec4f0293bc 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Build | Status -- | -- Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-gazebo/branch/main/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-gazebo) -Ubuntu Bionic | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_gazebo-ci-main-bionic-amd64)](https://build.osrfoundation.org/job/ignition_gazebo-ci-main-bionic-amd64) +Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_gazebo-ci-main-focal-amd64)](https://build.osrfoundation.org/job/ignition_gazebo-ci-main-focal-amd64) Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_gazebo-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_gazebo-ci-main-homebrew-amd64) Windows | [![Build Status](https://build.osrfoundation.org/job/ign_gazebo-ci-win/badge/icon)](https://build.osrfoundation.org/job/ign_gazebo-ci-win/) diff --git a/docker/README.md b/docker/README.md index 1c346dfde6..dae63aaaf1 100644 --- a/docker/README.md +++ b/docker/README.md @@ -110,15 +110,9 @@ Docker has two available versions: Community Edition (CE) and Enterprise Edition # Add the official GPG key of Docker curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - -1. Setup Docker using 1 of the two options below. +1. Setup Docker. - 1. Ubuntu Bionic users - - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) edge" - - 1. Everyone else. - - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" 1. Install Docker diff --git a/tutorials/install.md b/tutorials/install.md index 3260f10154..96de384802 100644 --- a/tutorials/install.md +++ b/tutorials/install.md @@ -18,7 +18,7 @@ Throughout this tutorial, be sure to replace `<#>` with a number value, such as ## Binary Install -### Ubuntu 18.04 or above +### Ubuntu 20.04 or above The binary install method will use pre-built packages which are typically available through a package management utility such as [Apt](https://wiki.debian.org/Apt). @@ -57,7 +57,7 @@ installing Ignition Gazebo from source. Install from source if you're interested in changing the source code or need a feature which hasn't been released yet. -### Ubuntu 18.04 or above +### Ubuntu 20.04 or above 1. Install tools ``` @@ -82,13 +82,7 @@ feature which hasn't been released yet. $(sort -u $(find . -iname 'packages-'`lsb_release -cs`'.apt' -o -iname 'packages.apt' | tr '\n' ' ')) ``` -5. (Ubuntu 18.04 only) Configure gcc8 - ``` - sudo apt-get install g++-8 - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 --slave /usr/bin/gcov gcov /usr/bin/gcov-8 - ``` - -6. Configure and build. +5. Configure and build. ``` cd ign-gazebo mkdir build From 4e8dfaf5267323a80860ee5d035df575b1d7a8b1 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 11 Mar 2022 14:19:58 -0800 Subject: [PATCH 2/2] enable static checkers Signed-off-by: Louise Poubel --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da0b5b6f2b..bf593694d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,3 +14,5 @@ jobs: uses: ignition-tooling/action-ignition-ci@focal with: codecov-enabled: true + cppcheck-enabled: true + cpplint-enabled: true