Skip to content

Commit a098b3d

Browse files
egpbosAxel-Naumann
authored andcommitted
revert format_script.sh change
Now that we correctly fetch the base_ref, we can put the format_script back into Travis-compatible state.
1 parent eb2fd24 commit a098b3d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.ci/format_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -ex
44

5-
# BASE_COMMIT=$(git rev-parse $TRAVIS_BRANCH)
5+
BASE_COMMIT=$(git rev-parse $TRAVIS_BRANCH)
66
echo "Running clang-format against branch $TRAVIS_BRANCH, with hash $BASE_COMMIT"
77
COMMIT_FILES=$(git diff --name-only $BASE_COMMIT | grep -i -v LinkDef)
88
RESULT_OUTPUT="$(git-clang-format --commit $BASE_COMMIT --diff --binary `which clang-format` $COMMIT_FILES)"

.github/workflows/code_analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
env:
1313
TRAVIS_BRANCH: ${{ github.base_ref }}
1414
TRAVIS_PULL_REQUEST_BRANCH: ${{ github.head_ref }}
15-
BASE_COMMIT: ${{ github.event.pull_request.base.sha }}
15+
# BASE_COMMIT: ${{ github.event.pull_request.base.sha }}
1616
steps:
1717
- uses: actions/checkout@v2
1818
- name: Fetch base_ref HEAD

0 commit comments

Comments
 (0)