Merge remote-tracking branch 'upstream/main'

.github/workflows/auto-clang-format.yml

@@ -6,18 +6,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: DoozyX/clang-format-lint-action@v0.13
-        with:
-          source: "."
-          exclude: "./third_party ./external"
-          extensions: "h,cpp,hpp"
-          clangFormatVersion: 12
-          inplace: True
-      - uses: EndBug/add-and-commit@v4
-        with:
-          author_name: Clang Robot
-          author_email: robot@example.com
-          message: ":art: Committing clang-format changes"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - uses: actions/checkout@v3
+    - uses: DoozyX/clang-format-lint-action@v0.13
+      with:
+        source: '.'
+        exclude: './third_party ./external'
+        extensions: 'h,cpp,hpp'
+        clangFormatVersion: 12
+        inplace: True
+    - uses: EndBug/add-and-commit@v4
+      with:
+        author_name: Clang Robot
+        author_email: robot@example.com
+        message: ':art: Committing clang-format changes'
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codeql-analysis.yml

@@ -47,7 +47,7 @@ jobs:
           - ON
 
     steps:
-      - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
       - name: Setup Cache
         uses: ./.github/actions/setup_cache
@@ -57,11 +57,11 @@ jobs:
           packaging_maintainer_mode: ${{ matrix.packaging_maintainer_mode }}
           generator: ${{ matrix.generator }}
 
-      - name: Setup Cpp
-        uses: aminya/setup-cpp@v1
-        with:
-          compiler: ${{ matrix.compiler }}
-          vcvarsall: ${{ contains(matrix.os, 'windows' )}}
+    - name: Project Name
+      uses: cardinalby/export-env-action@v2
+      with:
+        envFile: '.github/constants.env'
+
 
           cmake: true
           ninja: true

.github/workflows/template-janitor.yml

@@ -120,6 +120,13 @@ jobs:
           gcovr: false
           opencppcoverage: false
 
+      - name: Project Name
+        uses: cardinalby/export-env-action@v2
+        with:
+          envFile: '.github/constants.env'
+
+
+
       - name: Test simple configuration to make sure nothing broke
         run: |
           cmake -S . -B ./build -G "${{ matrix.generator }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.build_type }} -D${{ env.NEW_SAFE_PROJECT }}_PACKAGING_MAINTAINER_MODE:BOOL=ON
@@ -133,7 +140,8 @@ jobs:
           add: -A
           author_name: Template Janitor
           author_email: template.janitor@example.com
-          message: "Cleanup template and initialize repository"
+          message: 'Cleanup template and initialize repository'
+          pathspec_error_handling: exitImmediately
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -226,6 +234,7 @@ jobs:
           add: -A
           author_name: Template Janitor
           author_email: template.janitor@example.com
-          message: "Change Template Name"
+          message: 'Change Template Name'
+          pathspec_error_handling: exitImmediately
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

ProjectOptions.cmake

@@ -3,13 +3,6 @@ include(cmake/LibFuzzer.cmake)
 include(CMakeDependentOption)
 include(CheckCXXCompilerFlag)
 
-macro(myproject_setup_options)
-  option(myproject_ENABLE_HARDENING "Enable hardening" ON)
-  option(myproject_ENABLE_COVERAGE "Enable coverage reporting" OFF)
-  cmake_dependent_option(
-    myproject_ENABLE_GLOBAL_HARDENING "Attempt to push hardening options to built dependencies" ON
-    myproject_ENABLE_HARDENING OFF
-  )
 
 macro(myproject_supports_sanitizers)
   if((CMAKE_CXX_COMPILER_ID MATCHES ".*Clang.*" OR CMAKE_CXX_COMPILER_ID MATCHES ".*GNU.*") AND NOT WIN32)