Merge branch 'master' into bump-ssl

prince-chrismc · Jan 24, 2024 · c092d7d · c092d7d
2 parents b6a1ebd + 59cb1e6
commit c092d7d
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 37 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -17,7 +17,7 @@ jobs:
   default-linux:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
 
       - name: setup
@@ -36,7 +36,7 @@ jobs:
   default-linux-with-examples:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
 
       - name: setup
@@ -55,7 +55,7 @@ jobs:
   default-win:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
       - run: choco install openssl
 
@@ -75,7 +75,7 @@ jobs:
   min-req:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/install/cmake
         with:
           version: "3.14.7"
@@ -98,7 +98,7 @@ jobs:
   custom-install-linux:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
 
       - name: setup
@@ -117,7 +117,7 @@ jobs:
   custom-install-win:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
       - run: choco install openssl
 
@@ -137,7 +137,7 @@ jobs:
   no-pico:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
 
       - name: setup
@@ -156,7 +156,7 @@ jobs:
   no-base64:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
 
       - name: setup
@@ -175,7 +175,7 @@ jobs:
   with-libressl:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
       - uses: ./.github/actions/install/libressl
 
@@ -195,7 +195,7 @@ jobs:
   with-wolfssl:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
       - uses: ./.github/actions/install/wolfssl
         with:
@@ -217,7 +217,7 @@ jobs:
   with-hunter:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
 
       - name: setup

diff --git a/.github/workflows/cross-platform.yml b/.github/workflows/cross-platform.yml
@@ -13,7 +13,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - if: matrix.os != 'macos-latest'
         uses: ./.github/actions/install/openssl

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ssciwr/doxygen-install@v1
         with:
           version: "1.10.0"

diff --git a/.github/workflows/jwt.yml b/.github/workflows/jwt.yml
@@ -10,7 +10,7 @@ jobs:
   coverage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
       - uses: ./.github/actions/install/gtest
       - uses: ./.github/actions/install/danielaparker-jsoncons
@@ -27,15 +27,16 @@ jobs:
         working-directory: build
         run: make jwt-cpp-test coverage
 
-      - uses: coverallsapp/github-action@1.1.3
+      - uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          path-to-lcov: build/coverage.info
+          file: build/coverage.info
+          format: lcov
 
   fuzzing:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: lukka/get-cmake@latest
     - uses: ./.github/actions/install/gtest
 
@@ -62,7 +63,7 @@ jobs:
           - { tag: "openssl-3.2.0", name: "3.2.0" }
           - { tag: "OpenSSL_1_1_1w", name: "1.1.1w" }
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
       - uses: ./.github/actions/install/gtest
       - uses: ./.github/actions/install/openssl
@@ -91,7 +92,7 @@ jobs:
   ubsan:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
       - uses: ./.github/actions/install/gtest
 

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -23,7 +23,7 @@ jobs:
       - run: |
           sudo apt-get install clang-format-14
           shopt -s globstar
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: clang-format-14 -i ${{ matrix.files }}
       - uses: ./.github/actions/process-linting-results
         with:
@@ -41,7 +41,7 @@ jobs:
           python-version: "3.x"
       - run: pip install cmakelang
       - run: shopt -s globstar
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: cmake-format -i ${{ matrix.files }}
       - uses: ./.github/actions/process-linting-results
         with:
@@ -52,7 +52,7 @@ jobs:
     steps:
       - run: sudo apt-get install clang-tidy
       - uses: lukka/get-cmake@latest
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: configure
         run: |
           mkdir build
@@ -66,7 +66,7 @@ jobs:
           linter_name: clang-tidy
 
   render-defaults:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -78,22 +78,24 @@ jobs:
           - { name: "open_source_parsers_jsoncpp", library: "jsoncpp", url: "https://github.com/open-source-parsers/jsoncpp", disable_pico: true }
     name: render-defaults (${{ matrix.traits.name }})
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - run: |
+          sudo apt-get install clang-format-14
       - uses: ./.github/actions/render/defaults
         id: render
         with:
           traits_name: ${{ matrix.traits.name }}
           library_name: ${{ matrix.traits.library }}
           library_url: ${{ matrix.traits.url }}
           disable_default_traits: ${{ matrix.traits.disable_pico }}
-      - run: clang-format -i ${{ steps.render.outputs.file_path }}
+      - run: clang-format-14 -i ${{ steps.render.outputs.file_path }}
       - run: git add ${{ steps.render.outputs.file_path }}
       - uses: ./.github/actions/process-linting-results
         with:
           linter_name: render-defaults
 
   render-tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -105,13 +107,15 @@ jobs:
           - { name: "open_source_parsers_jsoncpp", suite: "OspJsoncppTest" }
     name: render-tests (${{ matrix.traits.name }})
     steps:
-      - uses: actions/checkout@v3
-      - run: shopt -s globstar
+      - uses: actions/checkout@v4
+      - run: |
+          sudo apt-get install clang-format-14
+          shopt -s globstar
       - uses: ./.github/actions/render/tests
         with:
           traits_name: ${{ matrix.traits.name }}
           test_suite_name: ${{ matrix.traits.suite }}
-      - run: clang-format -i tests/**/*.cpp
+      - run: clang-format-14 -i tests/**/*.cpp
       - run: git add tests/traits/*
       - uses: ./.github/actions/process-linting-results
         with:
@@ -120,7 +124,7 @@ jobs:
   line-ending:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: git add --renormalize .
       - uses: ./.github/actions/process-linting-results
         with:

diff --git a/.github/workflows/ssl.yml b/.github/workflows/ssl.yml
@@ -20,7 +20,7 @@ jobs:
           - { tag: "OpenSSL_1_0_1u", name: "1.0.1u" }
     name: OpenSSL ${{ matrix.openssl.name }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
       - uses: ./.github/actions/install/gtest
       - uses: ./.github/actions/install/openssl
@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-latest
     name: OpenSSL 3.0 No Deprecated
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
       - uses: ./.github/actions/install/gtest
       - uses: ./.github/actions/install/openssl
@@ -62,7 +62,7 @@ jobs:
         libressl: ["3.8.2", "3.7.2", "3.6.2"]
     name: LibreSSL ${{ matrix.libressl }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
       - uses: ./.github/actions/install/gtest
       - uses: ./.github/actions/install/libressl
@@ -91,7 +91,7 @@ jobs:
           - { ref: "v5.4.0-stable", name: "5.4.0"}
     name: wolfSSL ${{ matrix.wolfssl.name }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
       - uses: ./.github/actions/install/gtest
       - uses: ./.github/actions/install/wolfssl

diff --git a/.github/workflows/targets.yml b/.github/workflows/targets.yml
@@ -26,7 +26,7 @@ jobs:
       - run: |
           apt-get update
           apt-get install -y g++-4.8 wget make libssl-dev
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3 # Can not be upgrade as v4 needs NodeJS 20 doesn't exist next to gcc-4.8 
       - uses: ./.github/actions/install/cmake
         with:
           version: "3.26.3"
@@ -55,7 +55,7 @@ jobs:
       - run: |
           apt-get update
           apt-get install -y g++-12 wget make libssl-dev
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/install/cmake
         with:
           version: "3.26.3"

diff --git a/.github/workflows/traits.yml b/.github/workflows/traits.yml
@@ -19,7 +19,7 @@ jobs:
           - { name: "kazuho-picojson", tag: "111c9be5188f7350c2eac9ddaedd8cca3d7bf394", version: "111c9be" }
           - { name: "open-source-parsers-jsoncpp", tag: "1.9.5", version: "v1.9.5" }
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
       - name: setup
         run: |