From 83df2d2545e9de87527b60cc97dc9ce3df42f555 Mon Sep 17 00:00:00 2001
From: joanvallve <jvallve@iri.upc.edu>
Date: Fri, 26 Jul 2024 10:47:26 +0200
Subject: [PATCH] CI: trying a workflow without duplicated pipelines
---
.gitlab-ci.yml | 5 +++--
include/bodydynamics/utils/load_bodydynamics.h | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68a5809..6001e45 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,15 +13,16 @@ include:
# - scheduled
# - by a merge_request event
# - by a commit (push)
-# DO NOT RUN the pipeline after a commit in a MR (avoid duplicated pipelines)
+# DO NOT RUN the pipeline
+# - after a commit in a MR (avoid duplicated pipelines)
workflow:
rules:
- if: '$CI_PIPELINE_SOURCE == "web"'
- if: '$CI_PIPELINE_SOURCE == "schedule"'
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- - if: '$CI_COMMIT_BRANCH'
- if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS'
when: never
+ - if: '$CI_COMMIT_BRANCH'
stages:
- license
diff --git a/include/bodydynamics/utils/load_bodydynamics.h b/include/bodydynamics/utils/load_bodydynamics.h
index 3b24ea9..f7e7570 100644
--- a/include/bodydynamics/utils/load_bodydynamics.h
+++ b/include/bodydynamics/utils/load_bodydynamics.h
@@ -31,7 +31,7 @@ class LoadBodydynamics
static bool aux_var;
};
-#define WOLF_LOAD_BODYDYBAMICS \
+#define WOLF_LOAD_BODYDYNAMICS \
namespace \
{ \
const bool WOLF_UNUSED aux_var_bodydynamics = wolf::LoadBodydynamics::aux_var; \
--
GitLab