From 7692a7a0c0538789badd4115849d87d6b71ca097 Mon Sep 17 00:00:00 2001
From: Miguel Prada <miguel.prada@tecnalia.com>
Date: Tue, 3 Dec 2019 12:24:28 +0100
Subject: [PATCH] Enable clang-format job for melodic-devel branch
---
.gitlab-industrial-ci-kinetic-no-rosinstall.yml | 2 --
.gitlab-industrial-ci-kinetic-with-rosinstall.yml | 2 --
2 files changed, 4 deletions(-)
diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 641970d..f36a047 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -83,8 +83,6 @@ clang_format:
ROS_DISTRO: kinetic
CLANG_FORMAT_CHECK: file
CLANG_FORMAT_VERSION: "3.8"
- except:
- - melodic-devel
allow_failure: yes
##########################################################
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index 3987e0d..b331362 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -85,8 +85,6 @@ clang_format:
ROS_DISTRO: kinetic
CLANG_FORMAT_CHECK: file
CLANG_FORMAT_VERSION: "3.8"
- except:
- - melodic-devel
allow_failure: yes
##########################################################
--
GitLab