From 4829a3a6f2287d6028eadb1504c2645a71a50771 Mon Sep 17 00:00:00 2001 From: Weronika Lewandowska Date: Wed, 30 Jan 2019 13:47:43 +0100 Subject: [PATCH] common: fix clang format version issue Ref: pmem/issues#1004 --- utils/docker/build-local.sh | 3 +-- utils/docker/build-travis.sh | 3 +-- utils/docker/images/Dockerfile.ubuntu-18.04 | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/utils/docker/build-local.sh b/utils/docker/build-local.sh index cb55313e13c..867b12a5ca2 100755 --- a/utils/docker/build-local.sh +++ b/utils/docker/build-local.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2017-2018, Intel Corporation +# Copyright 2017-2019, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -115,7 +115,6 @@ docker run --privileged=true --name=$containerName -ti \ --env WORKDIR=$WORKDIR \ --env EXPERIMENTAL=$EXPERIMENTAL \ --env SCRIPTSDIR=$SCRIPTSDIR \ - --env CLANG_FORMAT=clang-format-6.0 \ --env KEEP_TEST_CONFIG=$KEEP_TEST_CONFIG \ $ndctl_enable \ -v $HOST_WORKDIR:$WORKDIR \ diff --git a/utils/docker/build-travis.sh b/utils/docker/build-travis.sh index 3b131b3e2a2..f029533d82e 100755 --- a/utils/docker/build-travis.sh +++ b/utils/docker/build-travis.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2016-2018, Intel Corporation +# Copyright 2016-2019, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -108,7 +108,6 @@ docker run --rm --privileged=true --name=$containerName -ti \ --env EXPERIMENTAL=$EXPERIMENTAL \ --env BUILD_PACKAGE_CHECK=$BUILD_PACKAGE_CHECK \ --env SCRIPTSDIR=$SCRIPTSDIR \ - --env CLANG_FORMAT=clang-format-6.0 \ --env TRAVIS=$TRAVIS \ --env TRAVIS_COMMIT_RANGE=$TRAVIS_COMMIT_RANGE \ --env TRAVIS_COMMIT=$TRAVIS_COMMIT \ diff --git a/utils/docker/images/Dockerfile.ubuntu-18.04 b/utils/docker/images/Dockerfile.ubuntu-18.04 index b65957b010f..37f317329a7 100644 --- a/utils/docker/images/Dockerfile.ubuntu-18.04 +++ b/utils/docker/images/Dockerfile.ubuntu-18.04 @@ -1,5 +1,5 @@ # -# Copyright 2016-2017, Intel Corporation +# Copyright 2016-2019, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -44,6 +44,7 @@ RUN apt-get update \ autoconf \ bc \ clang \ + clang-format \ cmake \ debhelper \ devscripts \