Move whl check into build-whl.sh

.github/actions/build-whl/action.yml

@@ -61,12 +61,6 @@ runs:
 
   - name: Test whl
     run: |
-      unzip -l python/dist/*.whl | tail -n +4 | head -n -2 | sed -E -e "s/^ +//" -e "s/ +/ /g" | cut -d " " -f 4- | grep "^pyspark/jars/" | tee contained-jars.txt
-      diff --left-column <(cd python; find gresearch -type f | grep -v ".pyc$" | sort) <(unzip -l python/dist/*.whl | tail -n +4 | head -n -2 | sed -E -e "s/^ +//" -e "s/ +/ /g" | cut -d " " -f 4- | sort) | grep "^<" | tee missing-files.txt
-
-      [ $(cat contained-jars.txt | wc -l) == "1" ]
-      [ ! -s missing-files.txt ]
-
       twine check python/dist/*
       pip install python/dist/*.whl --find-links https://archive.apache.org/dist/spark/spark-3.5.0
       python test-release.py

build-whl.sh

@@ -20,3 +20,14 @@ fi
 pip install build
 python -m build "$base/python/"
 
+# check for missing modules in whl file
+pyversion=${version/SNAPSHOT/dev0}
+pyversion=${pyversion//-/.}
+
+missing="$(diff <(cd $base/python; find gresearch -type f | grep -v ".pyc$" | sort) <(unzip -l $base/python/dist/pyspark_extension-${pyversion}-*.whl | tail -n +4 | head -n -2 | sed -E -e "s/^ +//" -e "s/ +/ /g" | cut -d " " -f 4- | sort) | grep "^<" || true)"
+if [ -n "$missing" ]
+then
+  echo "These files are missing from the whl file:"
+  echo "$missing"
+  exit 1
+fi