diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e36175c3a..da0b5b6f2 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 5f4f1da8e..dfc94331f 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Build | Status -- | -- Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-transport/branch/main/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-transport) -Ubuntu Bionic | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_transport-ci-main-bionic-amd64)](https://build.osrfoundation.org/job/ignition_transport-ci-main-bionic-amd64) +Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_transport-ci-main-focal-amd64)](https://build.osrfoundation.org/job/ignition_transport-ci-main-focal-amd64) Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_transport-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_transport-ci-main-homebrew-amd64) Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ign_transport-ci-win)](https://build.osrfoundation.org/job/ign_transport-ci-win/) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml deleted file mode 100644 index 899212acc..000000000 --- a/bitbucket-pipelines.yml +++ /dev/null @@ -1,57 +0,0 @@ -image: ubuntu:bionic - -pipelines: - default: - - step: - script: - # Install dependencies - - apt-get update - - apt-get -y install - gnupg lsb-release - cmake pkg-config cppcheck git build-essential curl - libprotobuf-dev protobuf-compiler libprotoc-dev libzmq3-dev uuid-dev - doxygen ruby-ronn libsqlite3-dev g++-8 - - 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 - - gcc -v - - g++ -v - - gcov -v - # lcov - - git clone https://github.com/linux-test-project/lcov.git -b v1.14 - - cd lcov - - make install - - cd .. - - echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -cs) main" > /etc/apt/sources.list.d/gazebo-stable.list - - echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-prerelease $(lsb_release -cs) main" > /etc/apt/sources.list.d/gazebo-stable.list - - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D2486D2DD83DB69272AFE98867170598AF249743 - - apt-get update - - apt-get -y install - libignition-cmake2-dev - libignition-math7-dev - libignition-msgs5-dev - libignition-tools-dev - # # Install ign-msgs - # - git clone http://github.com/ignitionrobotics/ign-msgs -b main - # - cd ign-msgs - # - mkdir build - # - cd build - # - cmake .. -DBUILD_TESTING=false - # - make -j4 install - # - cd ../.. - # Ignition Transport - - mkdir build - - cd build - - cmake .. -DCMAKE_BUILD_TYPE=coverage - - make -j4 - - make test ARGS="-VV" - - make coverage - # Use a special version of codecov for handling gcc8 output. - - bash <(curl -s https://raw.githubusercontent.com/codecov/codecov-bash/4678d212cce2078bbaaf5027af0c0dafaad6a095/codecov) -X gcovout -X gcov 2>/dev/null - - make doc - # - make codecheck - - make install - - cd .. - # Build examples - - cd example - - mkdir build && cd build - - cmake .. - - make -j4 diff --git a/docker/ign-transport/Dockerfile b/docker/ign-transport/Dockerfile index 11114f33b..3aa48ebd6 100644 --- a/docker/ign-transport/Dockerfile +++ b/docker/ign-transport/Dockerfile @@ -1,5 +1,5 @@ -# Ubuntu 18.04 -FROM ubuntu:bionic +# Ubuntu 20.04 +FROM ubuntu:focal # Tools I find useful during development RUN apt-get update \ @@ -20,18 +20,12 @@ RUN apt-get update \ doxygen \ ruby-ronn \ libsqlite3-dev \ - g++-8 \ sudo \ gnupg \ lsb-release \ wget \ && apt-get clean -# Use GCC 8 - RUN 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 - # Set USER and GROUP ARG USER=developer ARG GROUP=developer diff --git a/tutorials/02_installation.md b/tutorials/02_installation.md index 0e5b7ef92..70c7cff5d 100644 --- a/tutorials/02_installation.md +++ b/tutorials/02_installation.md @@ -84,7 +84,7 @@ which version you need. ## Ubuntu Linux For compiling the latest version of Ignition Transport you will need an -Ubuntu distribution equal to 18.04 (Bionic) or newer. +Ubuntu distribution equal to 20.04 (Focal) or newer. Make sure you have removed the Ubuntu pre-compiled binaries before installing from source: