Merge branch 'develop' into 'master'

merge develop into master

See merge request Scientific-IT-Systems/gr!1301

.gitlab-ci.yml

@@ -6,6 +6,23 @@ stages:
 - sync
 - deploy
 
+workflow:
+  # This workflow section prevents branch and merge request pipelines from
+  # being created at the same time avoiding duplicate pipelines:
+  # - if: $CI_PIPELINE_SOURCE == "merge_request_event" -> Create pipelines for open merge requests
+  # - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
+  #   ->  Do not create branch pipelines for open merge requests on push events but allow all other events (e.g.
+  #       pipeline trigger, API calls, etc.)
+  # - when: always -> Create all other pipeline types as usual
+  # Using workflow rules also ensures that all jobs are included in both branch and merge request pipelines
+  # See <https://docs.gitlab.com/ee/ci/yaml/workflow.html#switch-between-branch-pipelines-and-merge-request-pipelines>
+  # for more information
+  rules:
+  - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
+    when: never
+  - when: always
+
 include:
 - local: "/.gitlab-ci/build-arch.yml"
 - local: "/.gitlab-ci/build-binary-builder.yml"

.gitlab-ci/build-emscripten.yml

@@ -11,7 +11,3 @@ emscripten:
     expire_in: 1 week
     paths:
     - artifacts-js/
-  # Is needed to circumvent a bug in GitLab CI (if needed jobs do not contain a rule section, but the dependent job
-  # does, GitLab CI produces YAML errors)
-  rules:
-  - when: on_success

.gitlab-ci/test-emscripten.yml

@@ -1,10 +1,6 @@
 emscripten-test:
   stage: test
   image: iffregistry.fz-juelich.de/scientific-it-systems/gr-test/js-testing
-  rules:
-  - if: '$CI_MERGE_REQUEST_ID'
-    when: never
-  - when: on_success
   needs:
   - emscripten
   script:

.gitlab-ci/test-ubuntu.yml

@@ -1,10 +1,6 @@
 ubuntu-cmake-self-contained-test-c:
   stage: test
   image: iffregistry.fz-juelich.de/scientific-it-systems/gr-test/c-testing
-  rules:
-  - if: '$CI_MERGE_REQUEST_ID'
-    when: never
-  - when: on_success
   needs:
   - ubuntu-cmake-self-contained-debug
   script:
@@ -21,10 +17,6 @@ ubuntu-cmake-self-contained-test-c:
 ubuntu-cmake-self-contained-test-cpp:
   stage: test
   image: iffregistry.fz-juelich.de/scientific-it-systems/gr-test/cpp-testing
-  rules:
-  - if: '$CI_MERGE_REQUEST_ID'
-    when: never
-  - when: on_success
   needs:
   - ubuntu-cmake-self-contained-debug
   script:
@@ -41,10 +33,6 @@ ubuntu-cmake-self-contained-test-cpp:
 ubuntu-cmake-self-contained-test-grplot:
   stage: test
   image: iffregistry.fz-juelich.de/scientific-it-systems/gr-test/grplot-testing
-  rules:
-  - if: '$CI_MERGE_REQUEST_ID'
-    when: never
-  - when: on_success
   needs:
   - ubuntu-cmake-self-contained-debug
   script:
@@ -64,8 +52,6 @@ ubuntu-cmake-self-contained-test-snoop:
   stage: test
   image: iffregistry.fz-juelich.de/docker-images/gr-build-images/ubuntu-self-contained
   rules:
-  - if: '$CI_MERGE_REQUEST_ID'
-    when: never
   - if: '$CI_COMMIT_MESSAGE =~ /RebuildReferenceImages\([][ ?*_a-zA-Z0-9-]*\)/'
     when: never
   - if: '$GR_REBUILD_REFERENCE'

.gitlab-ci/test.yml

@@ -128,8 +128,8 @@ clang-tidy-check:
       -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
       -DGR_USE_BUNDLED_LIBRARIES=OFF
   - clang_tidy_failed=0;
-    ancestor=$(git merge-base upstream/develop HEAD)
-    [[ "${ancestor}" != "$(git rev-parse HEAD)" ]] || ancestor="HEAD~"
+    ancestor=$(git merge-base upstream/develop HEAD);
+    [[ "${ancestor}" != "$(git rev-parse HEAD)" ]] || ancestor="HEAD~";
     while IFS= read -r file; do
       [[ "${file}" != 3rdparty* ]] && [[ "${file}" != apps* ]] || continue;
       [[ "${file}" =~ \.(c|cpp|cxx|m|h|hpp|hxx)$ ]] || continue;

3rdparty/ffmpeg/Makefile

@@ -6,6 +6,8 @@ VERSION = 4.2.1
 FFMPEG_EXTRA_CONFIGURE_FLAGS ?=
 ifeq ($(shell uname),Darwin)
 FFMPEG_EXTRA_CONFIGURE_FLAGS += --extra-cflags=-mmacosx-version-min=10.15
+else ifeq ($(shell uname),Linux)
+FFMPEG_EXTRA_CONFIGURE_FLAGS += --extra-cflags=-Wno-error=incompatible-pointer-types
 endif
 
 

CMakeLists.txt

@@ -117,7 +117,13 @@ if(GR_USE_BUNDLED_LIBRARIES)
   # (`ONLY_CMAKE_FIND_ROOT_PATH` option is not inherited to `find_package` calls within the LibXml2 config file)
   find_package(LibXml2 NO_MODULE ONLY_CMAKE_FIND_ROOT_PATH)
 else()
-  find_package(LibXml2 NO_MODULE)
+  # On RHEL 9 based Linux distributions, `libxml2` is found in `/lib64` by default since the `PATH` variable is
+  # inspected by CMake to find potential prefix paths (`/bin` is present in `PATH` before `/usr/bin`). This causes
+  # errors because no `/include` directory is present on Linux and this is not checked by the LibXml2 config file.
+  # Therefore, disable the inspection of the `PATH` variable by setting `NO_SYSTEM_ENVIRONMENT_PATH` option.
+  # See <https://cmake.org/cmake/help/v3.30/command/find_package.html#:~:text=Search the standard system environment
+  # variables> for more details.
+  find_package(LibXml2 NO_MODULE NO_SYSTEM_ENVIRONMENT_PATH)
 endif()
 
 # Find the following packages only in 3rdparty, if `GR_USE_BUNDLED_LIBRARIES` is set