From 3c3c57d673d02fbb459ea6b8c04b0d15da19abf0 Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Mon, 31 Mar 2025 15:07:54 +0200 Subject: [PATCH] Fix base sha for lint workflow The base sha for push events is determined differently than for pr. Signed-off-by: Ralph Sennhauser --- .gitea/workflows/lint.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/lint.yml b/.gitea/workflows/lint.yml index 21f46f9cdd..3578e1a02d 100644 --- a/.gitea/workflows/lint.yml +++ b/.gitea/workflows/lint.yml @@ -7,6 +7,12 @@ on: jobs: cppcheck: runs-on: ubuntu-latest + env: + BASE_SHA: >- + ${{ + github.event_name == 'pull_request' && github.event.pull_request.base.sha || + github.event_name == 'push' && github.event.push.before + }} steps: - uses: actions/checkout@v4 @@ -37,7 +43,7 @@ jobs: run: sudo apt-get --assume-yes --no-install-recommends install cppcheck - name: Fetch the base branch, so we can use `git diff` - run: git fetch origin ${{ github.event.pull_request.base.ref }}:${{ github.event.pull_request.base.ref }} + run: git fetch origin ${{ env.BASE_SHA }} - name: Check for issues - run: ./source/tools/lint/cppcheck/cppcheck.sh --diff ${{ github.event.pull_request.base.ref }} + run: ./source/tools/lint/cppcheck/cppcheck.sh --diff ${{ env.BASE_SHA }}