fixup

.github/actions/set-build-env-vars/action.yml

@@ -48,3 +48,4 @@ runs:
         echo "CARGO_HOME=${GITHUB_WORKSPACE}/.cargo" >> $GITHUB_ENV
         echo "TARGET_DIR_NAME=${TARGET_DIR_NAME}" >> $GITHUB_ENV
         echo "BUILD_TYPE=${BUILD_TYPE}" >> $GITHUB_ENV
+        echo "VARIANT=${VARIANT}" >> $GITHUB_ENV

.github/workflows/build_and_test.yml

@@ -276,7 +276,7 @@ jobs:
           done
 
           # Install test executables and write list of all binaries (for code coverage)
-          if [[ $MATRIX_BUILD_TYPE == "debug" ]]; then
+          if [[ $VARIANT == "debug" ]]; then
             # Keep bloated coverage data files away from the rest of the artifact
             mkdir -p /tmp/coverage/
 
@@ -301,7 +301,7 @@ jobs:
             done
           else
             if [ "$cov_prefix" != "" ]; then
-              echo "expecting coverage prefix to be empty for all gh matrix build types except 'debug', got MATRIX_BUILD_TYPE=$MATRIX_BUILD_TYPE"
+              echo "expecting coverage prefix to be empty for all variants except 'debug', got VARIANT=$VARIANT"
               exit 1
             fi
           fi