Merge pull request #15455 from aabadie/pr/ci/static-test-fix-on-master

gh_actions: fix rebase issue with static-test
This commit is contained in:
Alexandre Abadie 2020-11-17 16:19:13 +01:00 committed by GitHub
commit 48aef18d9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,8 +4,6 @@ on:
push: push:
branches: branches:
- master - master
tags:
- '*'
pull_request: pull_request:
branches: branches:
- '*' - '*'
@ -20,12 +18,17 @@ jobs:
# in master (default behavior in GH actions) # in master (default behavior in GH actions)
# See https://github.com/actions/checkout#checkout-pull-request-head-commit-instead-of-merge-commit # See https://github.com/actions/checkout#checkout-pull-request-head-commit-instead-of-merge-commit
ref: ${{ github.event.pull_request.head.sha }} ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 0
- name: Setup git - name: Setup git
run: | run: |
git fetch origin master:master --no-tags git fetch origin master:master_upstream --no-tags
git config apply.whitespace nowarn git config apply.whitespace nowarn
- name: Fetch riot/riotbuild Docker image - name: Fetch riot/riotbuild Docker image
run: docker pull riot/riotbuild:latest run: docker pull riot/riotbuild:latest
- name: Run static-tests - name: Run static-tests
run: | 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