Merge branch 'develop' into feature/FDB-528-FAM-catalogue

Author: mcakircali

.clang-format

@@ -43,7 +43,7 @@ BreakConstructorInitializers: AfterColon
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: true
 ColumnLimit: 120
-CommentPragmas: '^ IWYU pragma:'
+CommentPragmas: "^ IWYU pragma:"
 CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 4
@@ -59,20 +59,39 @@ ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
+IncludeBlocks: Regroup
 IncludeCategories:
   - Regex: '^<.*\.h>'
     Priority: 1
-  - Regex: '^<.*'
+  - Regex: '^<.*\.hpp>'
     Priority: 2
-  - Regex: '.*'
+  - Regex: "<[[:alnum:]._]+>"
     Priority: 3
-IncludeIsMainRegex: '([-_](test|unittest))?$'
+  - Regex: '^((<|")(gtest|gmock|isl|json)/)'
+    Priority: 4
+  - Regex: '^"eccodes\/.*\.h"'
+    Priority: 5
+  - Regex: '^"eckit\/.*\.h"'
+    Priority: 6
+  - Regex: '^"odc\/.*\.h"'
+    Priority: 7
+  - Regex: '^"metkit\/.*\.h"'
+    Priority: 8
+  - Regex: '^"atlas\/.*\.h"'
+    Priority: 9
+  - Regex: '^"mir\/.*\.h"'
+    Priority: 10
+  - Regex: '^"fdb5\/.*\.h"'
+    Priority: 11
+  - Regex: ".*"
+    Priority: 1
+IncludeIsMainRegex: "([-_](test|unittest))?$"
 IndentCaseLabels: true
 IndentWidth: 4
 IndentWrappedFunctionNames: false
 KeepEmptyLinesAtTheStartOfBlocks: true
-MacroBlockBegin: ''
-MacroBlockEnd: ''
+MacroBlockBegin: ""
+MacroBlockEnd: ""
 MaxEmptyLinesToKeep: 2
 NamespaceIndentation: None
 PenaltyBreakAssignment: 2

.clang-tidy

@@ -1,19 +1,76 @@
 ---
-UseColor: On
-Checks: >-
+Checks: >
   -*,
-  readability-delete-null-pointer,
-  bugprone-assignment-in-if-condition,
-  bugprone-bool-pointer-implicit-conversion,
-  bugprone-casting-through-void,
-  bugprone-parent-virtual-call,
-  bugprone-unused-return-value,
-  bugprone-use-after-move,
+  bugprone-*,
+  performance-*,
+  cppcoreguidelines-*,
+  altera-*,
+  clang-analyzer-*,
+  google-*,
+  llvm-*,
+  misc-*,
+  modernize-*,
+  portability-*,
+  readability-*,
+  -cppcoreguidelines-pro-type-union-access,
+  -altera-unroll-loops,
+  -altera-struct-pack-align,
+  -llvm-header-guard,
+  -modernize-use-nodiscard,
+  -modernize-use-trailing-return-type,
+  -readability-redundant-access-specifiers,
 
+# Turn all the warnings from the checks above into errors.
+# WarningsAsErrors: '*'
+WarningsAsErrors: ""
+FormatStyle: "file"
+HeaderFileExtensions: ["", "h", "hh", "hpp", "hxx"]
+SystemHeaders: false
+ImplementationFileExtensions: ["c", "cc", "cpp", "cxx"]
+HeaderFilterRegex: ""
 
-WarningsAsErrors:             false
-HeaderFileExtensions:         ['', 'h','hh','hpp','hxx']
-ImplementationFileExtensions: ['c','cc','cpp','cxx']
-HeaderFilterRegex:            '.*'
-FormatStyle:                  none
-InheritParentConfig:          false
+CheckOptions:
+  - { key: readability-implicit-bool-conversion.AllowPointerConditions, value: true }
+  #
+  - { key: readability-identifier-naming.ClassCase, value: CamelCase }
+  - { key: readability-identifier-naming.StructCase, value: CamelCase }
+  - { key: readability-identifier-naming.TemplateParameterCase, value: CamelCase }
+  #
+  - { key: readability-identifier-naming.FunctionCase, value: camelBack }
+  - { key: readability-identifier-naming.VariableCase, value: camelBack }
+  - { key: readability-identifier-naming.ParameterCase, value: camelBack }
+  #
+  - { key: readability-identifier-naming.ClassMember, value: camelBack }
+  - { key: readability-identifier-naming.ClassMemberSuffix, value: "_" }
+  - { key: readability-identifier-naming.PublicMember, value: camelBack }
+  - { key: readability-identifier-naming.PrivateMemberCase, value: camelBack }
+  - { key: readability-identifier-naming.PrivateMemberSuffix, value: "_" }
+  - { key: readability-identifier-naming.ProtectedMemberCase, value: camelBack }
+  - { key: readability-identifier-naming.ProtectedMemberSuffix, value: "_" }
+  - { key: readability-identifier-naming.StaticMethodCase, value: camelBack }
+  #
+  - { key: readability-identifier-naming.MacroDefinitionCase, value: UPPER_CASE }
+  - { key: readability-identifier-naming.EnumConstantCase, value: UPPER_CASE }
+  #
+  - { key: readability-identifier-naming.NamespaceCase, value: lower_case }
+  - { key: readability-identifier-naming.ConstexprVariableCase, value: lower_case }
+  - { key: readability-identifier-naming.GlobalVariableCase, value: lower_case }
+  - { key: readability-identifier-naming.GlobalFunctionCase, value: camelBack }
+  - { key: readability-braces-around-statements.ShortStatementLines, value: "0" }
+
+  - { key: cppcoreguidelines-avoid-do-while.IgnoreMacros, value: true }
+  - { key: cppcoreguidelines-use-default-member-init.UseAssignment, value: true }
+
+  - { key: llvm-namespace-comment.ShortNamespaceLines, value: "2" }
+
+  - { key: google-readability-function-size.StatementThreshold, value: "800" }
+
+  - { key: modernize-loop-convert.MaxCopySize, value: "16" }
+  - { key: modernize-loop-convert.MinConfidence, value: reasonable }
+  - { key: modernize-loop-convert.NamingStyle, value: CamelCase }
+  - { key: modernize-pass-by-value.IncludeStyle, value: llvm }
+  - { key: modernize-replace-auto-ptr.IncludeStyle, value: llvm }
+  - { key: modernize-use-default-member-init.UseAssignment, value: true }
+  - { key: modernize-use-nullptr.NullMacros, value: "NULL" }
+
+  - { key: misc-non-private-member-variables-in-classes.IgnorePublicMemberVariables, value: true }

.github/workflows/build-ubuntu-rolling-fdb-build-env.yml

@@ -0,0 +1,56 @@
+name: Create Ubuntu Rolling FDB build environment
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '45 4 * * *'  # Every day at 4:45 AM UTC
+  push:
+    branches:
+      - develop
+    paths:
+      - 'containerfiles/ubuntu_rolling_fdb_build_env/**'
+  pull_request:
+    paths:
+      - 'containerfiles/ubuntu_rolling_fdb_build_env/**'
+
+env:
+  REGISTRY: eccr.ecmwf.int
+  IMAGE_NAME: ubuntu_rolling_fdb_build_env
+  PROJECT_NAME: ci-utils
+
+jobs:
+  build-and-push:
+    runs-on: [self-hosted, Linux, platform-builder-docker]
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+
+      - name: Log in to ECCR
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.ECMWF_DOCKER_REGISTRY_USERNAME }}
+          password: ${{ secrets.ECMWF_DOCKER_REGISTRY_ACCESS_TOKEN }}
+
+      - name: Extract metadata (tags, labels)
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.PROJECT_NAME }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=sha
+            type=raw,value=latest,enable={{is_default_branch}}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./containerfiles/ubuntu_rolling_fdb_build_env
+          file: ./containerfiles/ubuntu_rolling_fdb_build_env/Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}

.github/workflows/ci.yml

@@ -29,6 +29,8 @@ jobs:
       fdb: ecmwf/fdb@${{ github.event.pull_request.head.sha || github.sha }}
       codecov_upload: true
       clang_format: true
+      clang_format_ignore: |
+        third_party
     secrets: inherit
 
   # Run CI of private downstream packages on self-hosted runners

.github/workflows/docs.yml

@@ -9,7 +9,7 @@ on:
     tags:
       - '**'
 jobs:
-  build:
+  build-fdb:
     if: ${{ github.event_name == 'pull_request' && github.event.action != 'closed' || github.event_name == 'push'}}
     runs-on: ubuntu-latest
     outputs:
@@ -35,21 +35,22 @@ jobs:
         id: upload-doc
         uses: actions/upload-artifact@v4
         with:
-          name: documentation
+          name: documentation-fdb
           path: docs_out/sphinx
-  preview-publish:
+  preview-publish-fdb:
     if: ${{ github.event_name == 'pull_request' && github.event.action != 'closed' }}
-    needs: build
+    needs: build-fdb
     uses: ecmwf/reusable-workflows/.github/workflows/pr-preview-publish.yml@main
     with:
-      artifact-id: ${{ needs.build.outputs.artifact-id }}
+      artifact-id: ${{ needs.build-fdb.outputs.artifact-id }}
       space: docs
       name: dev-section
       path: fdb/pull-requests
-      link-text: 🌈🌦️📖🚧 Documentation 🚧📖🌦️🌈
+      link-tag: PREVIEW-PUBLISH-FDB
+      link-text: 🌈🌦️📖🚧 Documentation FDB 🚧📖🌦️🌈
     secrets:
       sites-token: ${{ secrets.ECMWF_SITES_DOCS_DEV_SECTION_TOKEN }}
-  preview-unpublish:
+  preview-unpublish-fdb:
     if: ${{ github.event_name == 'pull_request' && github.event.action == 'closed' }}
     uses: ecmwf/reusable-workflows/.github/workflows/pr-preview-unpublish.yml@main
     with:
@@ -58,17 +59,17 @@ jobs:
       path: fdb/pull-requests
     secrets:
       sites-token: ${{ secrets.ECMWF_SITES_DOCS_DEV_SECTION_TOKEN }}
-  publish:
+  publish-fdb:
     if: >-
       ${{ github.event_name == 'push' && (
         github.ref_name == 'develop' ||
         github.ref_name == 'master'  ||
         github.ref_type == 'tag'
       ) }}
-    needs: build
+    needs: build-fdb
     uses: ecmwf/reusable-workflows/.github/workflows/docs-publish.yml@main
     with:
-      artifact-id: ${{ needs.build.outputs.artifact-id }}
+      artifact-id: ${{ needs.build-fdb.outputs.artifact-id }}
       space: docs
       name: dev-section
       path: fdb