From 9b339df08595515bd57129cf6430025af6290d5e Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Tue, 17 Nov 2020 12:14:50 +0100 Subject: [PATCH] gh_actions: fix rebase issue in static-test Also remove the push triggers because they are useless --- .github/workflows/static-test.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/static-test.yml b/.github/workflows/static-test.yml index 023d546b4c..7d17466598 100644 --- a/.github/workflows/static-test.yml +++ b/.github/workflows/static-test.yml @@ -4,8 +4,6 @@ on: push: branches: - master - tags: - - '*' pull_request: branches: - '*' @@ -20,12 +18,17 @@ jobs: # in master (default behavior in GH actions) # See https://github.com/actions/checkout#checkout-pull-request-head-commit-instead-of-merge-commit ref: ${{ github.event.pull_request.head.sha }} + fetch-depth: 0 - name: Setup git run: | - git fetch origin master:master --no-tags + git fetch origin master:master_upstream --no-tags git config apply.whitespace nowarn - name: Fetch riot/riotbuild Docker image run: docker pull riot/riotbuild:latest - name: Run static-tests run: | - docker run --rm -v $(pwd):/data/riotbuild riot/riotbuild:latest make static-test + docker run --rm \ + -e CI_BASE_BRANCH=master_upstream \ + -v $(pwd):/data/riotbuild \ + riot/riotbuild:latest \ + make static-test