diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-09-15 14:01:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 14:01:20 +0200 |
| commit | ec651740191dc765c8a1fc5cc3c5348cd0cd2ccc (patch) | |
| tree | e26a6110693fe133f2ca12ab00ab3f12ab0f41e0 | |
| parent | fd485f2f13d59d94649fe32a1969150908f569c9 (diff) | |
| parent | af8ed50ae70409fb1a461474e1738dd004507a7d (diff) | |
Merge pull request #1380 from rouault/fix_verify_indent_pr
verify-indentation.sh: fix for pull request from bar/master to foo/master
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rwxr-xr-x | scripts/verify-indentation.sh | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index be2c2325..d8d59e40 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: - name: Install Requirements run: | sudo apt update - sudo apt install -y gcc g++ + sudo apt install -y gcc g++ libtiff-dev libwebp-dev libzstd-dev - name: Build and run tests run: | diff --git a/scripts/verify-indentation.sh b/scripts/verify-indentation.sh index 80c58283..a8065b0c 100755 --- a/scripts/verify-indentation.sh +++ b/scripts/verify-indentation.sh @@ -21,11 +21,9 @@ ASTYLEDIFF=/tmp/astyle.diff if [ ! -z $GITHUB_BASE_REF ] && [ ! -z $GITHUB_HEAD_REF ]; then # on a PR echo "GitHub PR COMMIT RANGE: ${GITHUB_BASE_REF}..${GITHUB_HEAD_REF}" - git branch ${GITHUB_BASE_REF} origin/${GITHUB_BASE_REF} - git branch ${GITHUB_HEAD_REF} origin/${GITHUB_HEAD_REF} - BASE_SHA1=$(git rev-parse ${GITHUB_BASE_REF}) - HEAD_SHA1=$(git rev-parse ${GITHUB_HEAD_REF}) - FILES=$(git diff --diff-filter=AMR --name-only ${BASE_SHA1}..${HEAD_SHA1} | tr '\n' ' ' ) + git branch tmp_${GITHUB_BASE_REF} origin/${GITHUB_BASE_REF} + BASE_SHA1=$(git rev-parse tmp_${GITHUB_BASE_REF}) + FILES=$(git diff --diff-filter=AMR --name-only ${BASE_SHA1}..${GITHUB_SHA} | tr '\n' ' ' ) elif [ ! -z $GITHUB_SHA ]; then echo "GitHub push COMMIT $GITHUB_SHA" FILES=$(git diff --diff-filter=AMR --name-only ${GITHUB_SHA}~1..${GITHUB_SHA} | tr '\n' ' ' ) |