[copy of] Tentative fixes for the atddiff check #207 (#211)

This is the same set of changes as #207 but I pushed this branch to the
original repo owned by semgrep instead of my personal fork. The CI
checks should now all pass.

Author: mjambon

.github/workflows/lint.yaml

@@ -31,7 +31,7 @@ jobs:
         set -x
 
         git config --global --add safe.directory "$(pwd)"
-        
+
         # github actions sets HOME=/home/github where we don't have an opam env
         eval $(HOME=/root opam env)
         apk add jq
@@ -40,9 +40,12 @@ jobs:
         atddiff --version
 
         # run the checks
-        echo -ne 'Backwards compatability summary:\n\n```' > summary-00-header.txt
+        echo -ne 'Backwards compatibility summary:\n\n```' > summary-00-header.txt
         echo '```' >> summary-20-footer.txt
-        ./scripts/check-backwards-compatability.sh | tee summary-10-body.txt
+
+        # fail if check command fails
+        set -o pipefail
+        ./scripts/check-backwards-compatibility | tee summary-10-body.txt
 
     - uses: marocchino/sticky-pull-request-comment@v2
       if: ${{ !cancelled() }}

scripts/check-backwards-compatability.sh renamed to scripts/check-backwards-compatibility

@@ -12,7 +12,14 @@
 #    - Diff the two diffs to see if new issues were introduced
 set -euo pipefail
 
-minimum="v$(curl -s https://semgrep.dev/api/check-version | jq -r '.versions.minimum')"
+version_url="https://semgrep.dev/api/check-version"
+min_version=$(curl -s "$version_url" | jq -r '.versions.minimum')
+if [[ -z "$min_version" ]]; then
+  echo "Failed to obtain minimum supported version from $version_url" >&2
+  exit 1
+fi
+
+minimum="v${min_version}"
 tags=$(git log --simplify-by-decoration --pretty=format:%D "${minimum}^!" origin/main | grep -o 'tag: [^,)]\+' | sed 's/^tag: //' | sort -n)
 
 checked=("dummy")
@@ -27,22 +34,27 @@ for tag in $tags; do
 
     set +e # do our own error handling for a bit
     echo "Checking backward compatibility of semgrep_output_v1.atd against past version $tag"
-    git difftool --trust-exit-code -x 'atddiff --no-locations --backward' -y "$tag" "origin/main" semgrep_output_v1.atd > before.txt
+    # I'm getting an exit code 128 when atddiff returns 3 (as of git 2.43.0),
+    # contrary to what 'git difftool --help' promises for '--trust-exit-code'.
+    # I'd report the bug if it was easier. -- Martin
+    git difftool --trust-exit-code -x 'atddiff --no-locations --backward' -y \
+        "$tag" "origin/main" -- semgrep_output_v1.atd > before.txt
     ret=$?
     if [ "$ret" -ge 1 ] && [ "$ret" -le 2 ]; then
-        echo "ERROR: atddiff had an error: $?"
+        echo "ERROR: atddiff had an error: $ret"
         cat before.txt
         exit 1
     fi
-    git difftool --trust-exit-code -x 'atddiff --no-locations --backward' -y "$tag" "HEAD" semgrep_output_v1.atd > after.txt
+    git difftool --trust-exit-code -x 'atddiff --no-locations --backward' -y \
+        "$tag" "HEAD" -- semgrep_output_v1.atd > after.txt
     ret=$?
     if [ "$ret" -ge 1 ] && [ "$ret" -le 2 ]; then
-        echo "ERROR: atddiff had an error: $?"
+        echo "ERROR: atddiff had an error: $ret"
         cat after.txt
         exit 1
     fi
 
-    diff -u <(cat before.txt) <(cat after.txt)
+    diff -u before.txt after.txt
     if [ "$?" -ne 0 ]; then
         echo "ERROR: semgrep_output_v1.atd is not backward compatible with $tag"
         errors=$((errors + 1))