From 54cb979d85f3ca7a1dd6b0010ded2eedef57efb3 Mon Sep 17 00:00:00 2001 From: Matteo De Carlo Date: Mon, 18 May 2020 11:29:17 +0200 Subject: [PATCH 1/2] tring to fix circleci --- gazebo/util/OpenAL.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gazebo/util/OpenAL.cc b/gazebo/util/OpenAL.cc index 04864a73de..622e8b1ca9 100644 --- a/gazebo/util/OpenAL.cc +++ b/gazebo/util/OpenAL.cc @@ -49,8 +49,8 @@ using namespace util; OpenAL::OpenAL() : dataPtr(new OpenALPrivate) { - this->dataPtr->context = NULL; - this->dataPtr->audioDevice = NULL; + this->dataPtr->context = nullptr; + this->dataPtr->audioDevice = nullptr; } ///////////////////////////////////////////////// From c55dddc75cd5f3e75bf99590a7e4ac29d79636af Mon Sep 17 00:00:00 2001 From: Matteo De Carlo Date: Mon, 18 May 2020 15:51:27 +0200 Subject: [PATCH 2/2] update ubuntu version and disabling docker_layer_caching as it's not available any more in circleci [free version] --- .circleci/config.yml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b3bb7afdcc..486ce67376 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: - checkout - setup_remote_docker: - docker_layer_caching: true + # docker_layer_caching: true # CACHE LOAD - restore_cache: diff --git a/Dockerfile b/Dockerfile index 0d230d6080..bd09803896 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 # DEPENDENCIES RUN apt-get update && apt-get upgrade -y && apt-get install -y \