diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68a580923bd93c8c64b577a087b15b888d9dfd12..6001e454a4b805d260f13db450b6721ad07bc53e 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 3b24ea925dc00e91d941154690fad22e525ab3d9..f7e757095c2b3d9db7464c72d7869f92ea607c92 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; \