move infer around (#173)

2 files changed, 19 insertions, 62 deletions

diff --git a/.github/workflows/infer.yml b/.github/workflows/infer.yml
index f7524223..365e748b 100644
--- a/.github/workflows/infer.yml
+++ b/.github/workflows/infer.yml
@@ -21,14 +21,29 @@ jobs:
       - name: Setup Infer
         uses: srz-zumix/setup-infer@v1
       - name: Run Infer on feature
-        run: ./.github/workflows/inferbuild.sh feature
+        run: |
+          echo On commit $(git log --pretty=%s -1)
+          mkdir -p ciwork
+          infer capture -- ./gradlew clean test --no-daemon
+          infer analyze
+          cp infer-out/report.json ciwork/report-feature.json
       - uses: actions/checkout@v2
         name: Checkout base
         with:
           ref: ${{ github.event.pull_request.base.sha }}
           clean: false
       - name: Run Infer on base
-        run: ./.github/workflows/inferbuild.sh base
+        run: |
+          echo On commit $(git log --pretty=%s -1)
+          infer capture --reactive -- ./gradlew clean test --no-daemon
+          infer analyze --reactive
       - name: Generate report
-        run: ./.github/workflows/inferbuild.sh report
-
+        run: |
+          infer reportdiff --report-current ciwork/report-feature.json --report-previous infer-out/report.json
+          jq -r '.[] | select(.severity == "ERROR") | ("::error file="+.file +",line=" +(.line|tostring)+"::" + .qualifier)' <infer-out/differential/introduced.json
+          jq -r '.[] | select(.severity == "WARNING") | ("::warning file="+.file +",line=" +(.line|tostring)+"::" + .qualifier)' <infer-out/differential/introduced.json
+          fixcount=$(jq -r "length" <infer-out/differential/fixed.json)
+          unfixcount=$(jq -r "length" <infer-out/differential/introduced.json)
+          othercount=$(jq -r "length" <infer-out/differential/preexisting.json)
+          echo "This PR fixes $fixcount potential bug(s), introduces $unfixcount potential bug(s). (Total present in feature branch: $((unfixcount + othercount)))" >>$GITHUB_STEP_SUMMARY
+          [[ $unfixcount != 0 ]] && exit 1 || echo ok.
diff --git a/.github/workflows/inferbuild.sh b/.github/workflows/inferbuild.sh
deleted file mode 100755
index b692a1ee..00000000
--- a/.github/workflows/inferbuild.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2022 NotEnoughUpdates contributors
-#
-# This file is part of NotEnoughUpdates.
-#
-# NotEnoughUpdates is free software: you can redistribute it
-# and/or modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation, either
-# version 3 of the License, or (at your option) any later version.
-#
-# NotEnoughUpdates is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
-#
-
-gradlecommand="./gradlew clean test --no-daemon"
-
-currentcommit=$(git log --pretty=%s -1)
-mkdir -p ciwork
-
-case $1 in
-feature)
-  echo "::group::Gradle build on $currentcommit"
-  infer capture -- $gradlecommand
-  echo "::endgroup::"
-
-  echo "::group::Infer analyzering on $currentcommit"
-  infer analyze
-  echo "::endgroup::"
-
-  cp infer-out/report.json ciwork/report-feature.json
-  ;;
-base)
-  echo "::group::Gradle build on $currentcommit"
-  infer capture --reactive -- $gradlecommand
-  echo "::endgroup::"
-
-  echo "::group::Infer analyzation on $currentcommit"
-  infer analyze --reactive
-  echo "::endgroup::"
-  ;;
-report)
-  infer reportdiff --report-current ciwork/report-feature.json --report-previous infer-out/report.json
-  jq -r '.[] | select(.severity == "ERROR") | ("::error file="+.file +",line=" +(.line|tostring)+"::" + .qualifier)' <infer-out/differential/introduced.json
-  jq -r '.[] | select(.severity == "WARNING") | ("::warning file="+.file +",line=" +(.line|tostring)+"::" + .qualifier)' <infer-out/differential/introduced.json
-  fixcount=$(jq -r "length" <infer-out/differential/fixed.json)
-  unfixcount=$(jq -r "length" <infer-out/differential/introduced.json)
-  othercount=$(jq -r "length" <infer-out/differential/preexisting.json)
-  echo "This PR fixes $fixcount potential bug(s), introduces $unfixcount potential bug(s). (Total present in feature branch: $((unfixcount + othercount)))" >>$GITHUB_STEP_SUMMARY
-  if [[ $unfixcount != 1 ]]; then
-    exit 1
-  fi
-  ;;
-esac