Reusable CI: Allow specifying targets, defines, link and variant for B2 builds

Author: Flamefire

.github/workflows/reusable.yml

@@ -19,6 +19,26 @@ permissions:
 on:
   workflow_call:
     inputs:
+      b2_targets:
+        description: "B2 targets to build, e.g. 'libs/foo/test//bar'. Defaults to auto-detecting the tests"
+        required: false
+        type: string
+        default: ''
+      b2_defines:
+        description: "Preprocessor defines to add"
+        required: false
+        type: string
+        default: ''
+      b2_link:
+        description: "Build shared and/or static"
+        required: false
+        type: string
+        default: 'shared,static'
+      b2_variant:
+        description: "Variants/Optimization level(s) to build"
+        required: false
+        type: string
+        default: 'debug,release'
       branch_coverage:
         description: "Collect branch coverage instead of line coverage. Enabled by default."
         required: false
@@ -113,8 +133,6 @@ concurrency:
 env:
   GIT_FETCH_JOBS: 8
   NET_RETRY_COUNT: 5
-  B2_VARIANT: debug,release
-  B2_LINK: shared,static
   LCOV_BRANCH_COVERAGE: ${{ inputs.branch_coverage && '1' || '0' }}
   CODECOV_NAME: Github Actions
 
@@ -433,15 +451,11 @@ jobs:
           ENABLE_REFLECTION: ${{ matrix.reflection }}
           B2_SANITIZE: ${{matrix.sanitize}}
           B2_STDLIB: ${{matrix.stdlib}}
-          # Optional. Variables set here (to non-empty) will override the top-level environment variables
-          B2_DEFINES: ${{matrix.defines}}
-          B2_VARIANT: ${{matrix.variant}}
-          B2_LINK: ${{matrix.link}}
+          B2_DEFINES: ${{inputs.b2_defines}}
+          B2_LINK: ${{inputs.b2_link}}
+          B2_VARIANT: ${{inputs.b2_variant}}
           XCODE_APP: ${{matrix.xcode_app}}
-          # More entries can be added in the same way, see the B2_ARGS assignment in ci/enforce.sh for the possible keys.
-          # Set the (B2) target(s) to build, defaults to the test folder of the current library
-          # Can alternatively be done like this in the build step or in the build command of the build step, e.g. `run: B2_TARGETS=libs/$SELF/doc ci/build.sh`
-          # B2_TARGETS: libs/foo/test//bar
+
 
       - name: Setup coverage collection
         if: matrix.coverage
@@ -450,6 +464,8 @@ jobs:
       - name: Run tests
         if: '!matrix.coverity'
         run: ci/build.sh
+        env:
+          B2_TARGETS: ${{inputs.b2_targets}}
         # inherits environment from install.sh step
 
       - name: Show config.log
@@ -596,9 +612,9 @@ jobs:
           B2_TARGET_OS: ${{matrix.target-os}}
           B2_CXXSTD: ${{matrix.cxxstd}}
           B2_ADDRESS_MODEL: ${{matrix.address-model}}
-          B2_DEFINES: ${{matrix.defines}}
-          B2_VARIANT: ${{matrix.variant}}
-          B2_LINK: ${{matrix.link}}
+          B2_DEFINES: ${{inputs.b2_defines}}
+          B2_LINK: ${{inputs.b2_link}}
+          B2_VARIANT: ${{inputs.b2_variant}}
 
       - name: Collect coverage
         shell: powershell
@@ -608,9 +624,9 @@ jobs:
           B2_TOOLSET: ${{matrix.toolset}}
           B2_CXXSTD: ${{matrix.cxxstd}}
           B2_ADDRESS_MODEL: ${{matrix.address-model}}
-          B2_DEFINES: ${{matrix.defines}}
-          B2_VARIANT: ${{matrix.variant}}
-          B2_LINK: ${{matrix.link}}
+          B2_DEFINES: ${{inputs.b2_defines}}
+          B2_LINK: ${{inputs.b2_link}}
+          B2_VARIANT: ${{inputs.b2_variant}}
 
       - name: Upload coverage
         if: matrix.coverage
@@ -719,9 +735,9 @@ jobs:
           B2_CXXSTD: ${{matrix.cxxstd}}
           B2_SANITIZE: ${{matrix.sanitize}}
           B2_STDLIB: ${{matrix.stdlib}}
-          B2_DEFINES: ${{matrix.defines}}
-          B2_VARIANT: ${{matrix.variant}}
-          B2_LINK: ${{matrix.link}}
+          B2_DEFINES: ${{inputs.defines}}
+          B2_LINK: ${{inputs.link}}
+          B2_VARIANT: ${{inputs.variant}}
 
       - name: Run tests
         run: ci/build.sh