Skip to content

Commit c13d2ad

Browse files
dschogitster
authored andcommitted
coverity: allow running on macOS
For completeness' sake, let's add support for submitting macOS builds to Coverity Scan. Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d3c3ffa commit c13d2ad

File tree

1 file changed

+20
-2
lines changed

1 file changed

+20
-2
lines changed

.github/workflows/coverity.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
if: contains(matrix.os, 'windows')
4444
uses: git-for-windows/setup-git-for-windows-sdk@v1
4545
- run: ci/install-dependencies.sh
46-
if: contains(matrix.os, 'ubuntu')
46+
if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos')
4747
env:
4848
runs_on_pool: ${{ matrix.os }}
4949

@@ -56,10 +56,17 @@ jobs:
5656
*windows*)
5757
COVERITY_PLATFORM=win64
5858
COVERITY_TOOL_FILENAME=cov-analysis.zip
59+
MAKEFLAGS=-j$(nproc)
60+
;;
61+
*macos*)
62+
COVERITY_PLATFORM=macOSX
63+
COVERITY_TOOL_FILENAME=cov-analysis.dmg
64+
MAKEFLAGS=-j$(sysctl -n hw.physicalcpu)
5965
;;
6066
*ubuntu*)
6167
COVERITY_PLATFORM=linux64
6268
COVERITY_TOOL_FILENAME=cov-analysis.tgz
69+
MAKEFLAGS=-j$(nproc)
6370
;;
6471
*)
6572
echo '::error::unhandled OS ${{ matrix.os }}' >&2
@@ -68,6 +75,7 @@ jobs:
6875
esac
6976
echo "COVERITY_PLATFORM=$COVERITY_PLATFORM" >>$GITHUB_ENV
7077
echo "COVERITY_TOOL_FILENAME=$COVERITY_TOOL_FILENAME" >>$GITHUB_ENV
78+
echo "MAKEFLAGS=$MAKEFLAGS" >>$GITHUB_ENV
7179
MD5=$(curl https://scan.coverity.com/download/$COVERITY_LANGUAGE/$COVERITY_PLATFORM \
7280
--fail \
7381
--form token='${{ secrets.COVERITY_SCAN_TOKEN }}' \
@@ -99,6 +107,16 @@ jobs:
99107
mkdir $RUNNER_TEMP/cov-analysis &&
100108
tar -xzf $RUNNER_TEMP/$COVERITY_TOOL_FILENAME --strip 1 -C $RUNNER_TEMP/cov-analysis
101109
;;
110+
*.dmg)
111+
cd $RUNNER_TEMP &&
112+
attach="$(hdiutil attach $COVERITY_TOOL_FILENAME)" &&
113+
volume="$(echo "$attach" | cut -f 3 | grep /Volumes/)" &&
114+
mkdir cov-analysis &&
115+
cd cov-analysis &&
116+
sh "$volume"/cov-analysis-macosx-*.sh &&
117+
ls -l &&
118+
hdiutil detach "$volume"
119+
;;
102120
*.zip)
103121
cd $RUNNER_TEMP &&
104122
mkdir cov-analysis-tmp &&
@@ -120,7 +138,7 @@ jobs:
120138
run: |
121139
export PATH="$RUNNER_TEMP/cov-analysis/bin:$PATH" &&
122140
cov-configure --gcc &&
123-
cov-build --dir cov-int make -j$(nproc)
141+
cov-build --dir cov-int make
124142
- name: package the build
125143
run: tar -czvf cov-int.tgz cov-int
126144
- name: submit the build to Coverity Scan

0 commit comments

Comments
 (0)