diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 0cfe7585d5..b8a90ab57c 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -32,6 +32,7 @@ jobs: - name: Build MacPorts Base run: | set -eu + # shellcheck disable=2046 make -j$(sysctl -n hw.activecpu) - name: Install MacPorts Base run: | @@ -47,7 +48,9 @@ jobs: xcrun llvm-profdata merge --sparse --output=cov.profdata cov-*.profraw # tracelib cannot be profiled OBJ_FILES="$(find src -type f "(" -name "*.dylib" -o -name "*.a" ")" | grep -Fv darwintracelib1.0 | sed 's/^/--arch=arm64 --object=/')" + # shellcheck disable=2086 xcrun llvm-cov show --format=html --output-dir=covreport --ignore-filename-regex=vendor/ --instr-profile=cov.profdata $OBJ_FILES + # shellcheck disable=2086 xcrun llvm-cov report --ignore-filename-regex=vendor/ --instr-profile=cov.profdata $OBJ_FILES - name: Archive code coverage results uses: actions/upload-artifact@v4 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ead3346929..7f39d4e4da 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: - name: Select Xcode version if: startsWith(matrix.os,'macos') run: | - case "`uname -r`" in + case "$(uname -r)" in 22.*) sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer ;; 23.*) sudo xcode-select --switch /Applications/Xcode_15.3.app/Contents/Developer @@ -47,9 +47,13 @@ jobs: set -eu platform=$(uname -s) case ${platform} in - Darwin) make -j$(sysctl -n hw.activecpu) + Darwin) + # shellcheck disable=2046 + make -j$(sysctl -n hw.activecpu) ;; - Linux) make -j$(nproc) + Linux) + # shellcheck disable=2046 + make -j$(nproc) ;; esac - name: Install MacPorts Base