[IO-1554][internal] Further CI/CD tooling

.github/workflows/EVENT_pull_request.yml

@@ -31,15 +31,15 @@ jobs:
     with:
       files: ${{ needs.get_changed_files.outputs.python_changed_files }}
 
-  # TODO: See Issue IO-1666
-  # typecheck:
-  #   name: Analyse types in python
-  #   needs: get_changed_files
-  #   uses: ./.github/workflows/JOB_typecheck.yml
-  #   with:
-  #     files: ${{ needs.get_changed_files.outputs.python_changed_files }}
+  typecheck:
+    name: Analyse types in python
+    needs: get_changed_files
+    uses: ./.github/workflows/JOB_typecheck.yml
+    with:
+      files: ${{ needs.get_changed_files.outputs.python_changed_files }}
 
   run_tests:
+    needs: [format, lint, typecheck]
     name: Run tests
     uses: ./.github/workflows/JOB_tests.yml
 

.github/workflows/JOB_format.yml

@@ -11,6 +11,7 @@ on:
 
 jobs:
   format:
+    if: ${{ inputs.files != '' }}
     runs-on: ubuntu-latest
     steps:
     - name: Check out source repository
@@ -21,6 +22,10 @@ jobs:
       with:
         python-version: "3.11"
 
+    - name: Show filenames
+      run: echo ${{ inputs.files }}
+
     - name: Black check
       shell: bash
       run: bash ${{ github.workspace }}/deploy/format_lint.sh format ${{ inputs.files }}
+

.github/workflows/JOB_lint.yml

@@ -11,6 +11,7 @@ on:
 
 jobs:
   lint:
+    if: ${{ inputs.files != '' }}
     runs-on: ubuntu-latest
     steps:
     - name: Check out source repository
@@ -21,6 +22,10 @@ jobs:
       with:
         python-version: "3.10"
 
-    - name: flake8 Lint
+    - name: Show filenames
+      run: echo ${{ inputs.files }}
+
+    - name: Ruff Lint
       shell: bash
       run: bash ${{ github.workspace }}/deploy/format_lint.sh lint ${{ inputs.files }}
+

.github/workflows/JOB_typecheck.yml

@@ -11,6 +11,7 @@ on:
 
 jobs:
   typecheck:
+    if: ${{ inputs.files != '' }}
     runs-on: ubuntu-latest
     steps:
     - name: Check out source repository
@@ -21,12 +22,12 @@ jobs:
       with:
         python-version: "3.10"
 
-    - name: Install dependencies
-      shell: bash
-      run: |
-        pip install poetry
-        poetry install install --all-extras -vvv --no-root
+    - name: Show filenames
+      run: echo ${{ inputs.files }}
 
     - name: MyPy typecheck
       shell: bash
-      run: bash ${{ github.workspace }}/deploy/format_lint.sh typecheck ${{ inputs.files }}
+      run: |
+        pip install pydantic
+        bash ${{ github.workspace }}/deploy/format_lint.sh typecheck ${{ inputs.files }}
+

deploy/format_lint.sh

@@ -2,7 +2,7 @@
 
 ACTION=$1
 shift 1
-FILES=$@
+FILES=$*
 
 echo "Action: $ACTION"
 echo "Files: $FILES"
@@ -20,84 +20,86 @@ if [[ -z $FILES ]]; then
 fi
 
 # Install dependencies
+pipinstall() {
+    if ! pip install "$@" &> pip_log.txt; then
+        echo "Pip install failed"
+        cat pip_log.txt
+        rm pip_log.txt
+        exit 1
+    fi
+}
+
 if [ "$ACTION" == "format" ]; then
-    pip install black &> pip_log.txt
+    pipinstall black
     elif [ "$ACTION" == "lint" ]; then
-    pip install ruff &> pip_log.txt
+    pipinstall ruff
     elif [ "$ACTION" == "typecheck" ]; then
-    pip install mypy &> pip_log.txt
+    pipinstall mypy
 else
     echo "Action must be format, typecheck, or lint"
     exit 1
 fi
 
-# Check if pip install failed
-if [ $? -ne 0 ]; then
-    echo "Pip install failed"
-    cat pip_log.txt
-    rm pip_log.txt
-    exit 1
-fi
-
 failed_files=""
 echo "** Checking files [$FILES] **"
 
 for file in $FILES ; do
+
+    if [[ ! -f $file ]]; then
+        echo
+        echo "📁 Skipping file $file, file doesn't exist.  Was probably removed in PR diff."
+        continue
+    fi
+
     echo "_________________________________________________________"
+    echo
     echo "Checking $file"
-
-    if [ -f $file ]; then
-        if [ "$ACTION" == "lint" ]; then
-            ruff check $FILES; rc=$?
-            echo "$rc"
-            if [ $rc -ne 0 ]; then
-                failed_files="$failed_files $file"
-                echo "❌"
-            else
-                echo "✅"
-            fi
+
+
+    if [ "$ACTION" == "lint" ]; then
+
+        if ! ruff check "$file"; then
+            failed_files="$failed_files $file"
+            echo "❌"
+        else
+            echo "✅"
         fi
-
-        if [ "$ACTION" == "typecheck" ]; then
-            mypy $file
-            if [ $? -ne 0 ]; then
-                failed_files="$failed_files $file"
-                echo "❌"
-            else
-                echo "✅"
-            fi
+    fi
+
+    if [ "$ACTION" == "typecheck" ]; then
+
+        if ! mypy "$file"; then
+            failed_files="$failed_files $file"
+            echo "❌"
+        else
+            echo "✅"
         fi
-
-        if [ "$ACTION" == "format" ]; then
-            black --check $file
-            if [ $? -ne 0 ]; then
-                failed_files="$failed_files $file"
-                echo "❌"
-            else
-                echo "✅"
-            fi
+    fi
+
+    if [ "$ACTION" == "format" ]; then
+
+        if ! black --check "$file"; then
+            failed_files="$failed_files $file"
+            echo "❌"
+        else
+            echo "✅"
         fi
-    else
-        echo "File $file does not exist"
     fi
-
-    echo "DEBUG"
-    echo "failed_files: $failed_files"
-
+
     echo "_________________________________________________________"
 done
 
 echo
 echo
 
 if [[ "$failed_files" != "" ]]; then
-    echo "Checks failed for $failed_formatting files 😢"
+    echo "Checks failed for $failed_files files 😢"
     echo "Failed files"
     for file in $failed_files ; do
         echo "- $file"
     done
     exit 1
 else
-    echo "Formatting passed for all files 🎉"
+    echo "$ACTION passed for all files 🎉"
 fi
 exit 0