Maintenance to Fedora CI infrastructure and upgrade to nl::json 3.12.0 (#363)

* Simplify fedora CI

* Update pre-commits

* Run pre-commit

* Disable tests that cannot be built

* Skip failing tests

* Library was renamed

* Disable aarch64 for now

* copy-paste leftover

* Disable testing-farm tests for now

* Upgraded to nlohmann_json 3.12.0

* Moved json-schema-validate under test

---------

Co-authored-by: Johan Mabille <[email protected]>

Author: LecrisUT

.distro/.gitignore

@@ -49,10 +49,10 @@ Json schema validator development files for C++ projects using nlohmann/json
 %files
 %doc README.md
 %license LICENSE
-%{_libdir}/libnlohmann_json_validator.so.*
+%{_libdir}/libnlohmann_json_schema_validator.so.*
 
 %files devel
-%{_libdir}/libnlohmann_json_validator.so
+%{_libdir}/libnlohmann_json_schema_validator.so
 %{_includedir}/nlohmann/json-schema.hpp
 %{_libdir}/cmake/nlohmann_json_schema_validator
 

.distro/json-schema-validator.rpmlintrc

@@ -1,4 +1,10 @@
 discover:
   how: fmf
-  dist-git-source: true
-  path: .distro
+  path: .
+
+adjust+:
+  # Cannot use initiator: fedora-ci reliably yet
+  when: initiator is not defined or initiator != packit
+  discover+:
+    dist-git-source: true
+    dist-git-extract: json-schema-validator-*/

.distro/json-schema-validator.spec

@@ -30,7 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         toolchain: [ gcc, llvm, intel ]
-        json_version: [ v3.11.2, v3.8.0 ]
+        json_version: [ develop, v3.12.0, v3.8.0 ]
         experimental: [ false ]
         include:
           - toolchain: llvm

.distro/packit.toml

@@ -1,79 +1,68 @@
-specfile_path: .distro/json-schema-validator.spec
 files_to_sync:
-    - src: .distro/json-schema-validator.spec
-      dest: json-schema-validator.spec
-    - .packit.yaml
-    - src: .distro/json-schema-validator.rpmlintrc
-      dest: json-schema-validator.rpmlintrc
-    # tmt setup
-    - src: .distro/.fmf/
-      dest: .fmf/
-    - src: .distro/plans/
-      dest: plans/
-      filters:
-          - "- .distro/plans/main.fmf.dist-git"
-          - "- .distro/plans/rpmlint.fmf"
-    - src: .distro/plans/main.fmf.dist-git
-      dest: plans/main.fmf
+  - src: .distro/
+    dest: ./
+    delete: true
+    filters:
+      - "protect .git*"
+      - "protect sources"
+      - "protect changelog"
+      - "protect gating.yaml"
+      # Temporary workaround until
+      # https://github.com/packit/packit/pull/2573
+      - "- json-schema-validator.spec"
+  - .packit.yaml
+
 upstream_package_name: json-schema-validator
+specfile_path: .distro/json-schema-validator.spec
 downstream_package_name: json-schema-validator
 update_release: false
-upstream_tag_template: v{version}
+
+targets: &targets
+  - fedora-all-x86_64
+  # TODO: aarch64 is failing at test
+  # JSON-Suite::Optional::Format::idn-email
+  # - fedora-all-aarch64
+
+_:
+  # Job templates
+  - &build-in-packit
+    job: copr_build
+  - &build-in-lecris
+    <<: *build-in-packit
+    owner: "@scikit-build"
+  - &tests
+    job: tests
+    fmf_path: .distro
+    identifier: downstream
 
 jobs:
-    - job: copr_build
-      trigger: pull_request
-      owner: lecris
-      project: json-schema-validator
-      update_release: true
-      release_suffix: "{PACKIT_RPMSPEC_RELEASE}"
-      targets:
-          - fedora-development
-    - job: tests
-      trigger: pull_request
-      targets:
-          - fedora-development
-      fmf_path: .distro
-    - job: copr_build
-      trigger: commit
-      branch: main
-      owner: lecris
-      project: nightly
-      # TODO: Remove when upstream issue is resolved
-      # https://github.com/packit/packit/issues/1924
-      additional_repos:
-          - copr://@scikit-build/release
-      targets:
-          - fedora-development-x86_64
-          - fedora-latest-x86_64
-          - fedora-development-aarch64
-          - fedora-latest-aarch64
-    - job: copr_build
-      trigger: release
-      owner: lecris
-      project: release
-      targets:
-          - fedora-development-x86_64
-          - fedora-latest-x86_64
-          - fedora-development-aarch64
-          - fedora-latest-aarch64
-    - job: tests
-      trigger: commit
-      branch: main
-      targets:
-          - fedora-development
-          - fedora-latest
-      fmf_path: .distro
-    - job: propose_downstream
-      trigger: release
-      dist_git_branches:
-          - fedora-development
-          - fedora-latest
-    - job: koji_build
-      trigger: commit
-      dist_git_branches:
-          - fedora-all
-    - job: bodhi_update
-      trigger: commit
-      dist_git_branches:
-          - fedora-branched
+  # Upstream jobs
+  - <<: *build-in-lecris
+    trigger: release
+    project: release
+#  - <<: *tests
+#    trigger: release
+  - <<: *build-in-lecris
+    trigger: commit
+    branch: main
+    project: nightly
+#  - <<: *tests
+#    trigger: commit
+#    branch: main
+  - <<: *build-in-packit
+    trigger: pull_request
+#  - <<: *tests
+#    trigger: pull_request
+  # Downstream jobs
+  - job: propose_downstream
+    trigger: release
+    dist_git_branches:
+      - fedora-rawhide
+  - job: koji_build
+    trigger: commit
+    dist_git_branches:
+      - fedora-all
+  - job: bodhi_update
+    trigger: commit
+    dist_git_branches:
+      - fedora-branched

.distro/plans/main.fmf.dist-git

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/Takishima/cmake-pre-commit-hooks
-    rev: v1.8.1
+    rev: v1.9.6
     hooks:
       - id: clang-format
         args:
@@ -15,19 +15,19 @@ repos:
           - 'pre-commit'
         stages: [ manual ]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-yaml
   - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.16
+    rev: 0.7.22
     hooks:
       - id: mdformat
         additional_dependencies:
           - mdformat-gfm
           - mdformat-tables
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.23.0
+    rev: 0.34.0
     hooks:
       - id: check-github-workflows