From 29818b8e9241d5d891e150bd4ba523c899ecacd0 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 15 Sep 2021 13:21:25 +0200
Subject: [PATCH 1/2] verify-indentation.sh: fix for pull request from
 bar/master to foo/master

---
 scripts/verify-indentation.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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' ' ' )

From af8ed50ae70409fb1a461474e1738dd004507a7d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 15 Sep 2021 13:40:50 +0200
Subject: [PATCH 2/2] CI 'regular': fix static builds when doing perf checks

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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: |