Upgrade setup-python GH action (2.18 release branch) (#1204)

papa99do · web-flow · commit d4824d850763 · 2025-04-29T11:32:02.000+10:00
diff --git a/.github/workflows/backwards_compatibility_marqo_execution.yml b/.github/workflows/backwards_compatibility_marqo_execution.yml
@@ -76,7 +76,7 @@ jobs:
 
       # Step to set up Python 3.9
       - name: Set up Python 3.9
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
           cache: "pip"
diff --git a/.github/workflows/backwards_compatibility_marqo_orchestrator.yml b/.github/workflows/backwards_compatibility_marqo_orchestrator.yml
@@ -99,7 +99,7 @@ jobs:
 
       # Step to set up Python 3.9
       - name: Set up Python 3.9
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: '3.9'
           cache: "pip"
diff --git a/.github/workflows/cpu_docker_marqo.yml b/.github/workflows/cpu_docker_marqo.yml
@@ -54,7 +54,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
           cache: "pip"
diff --git a/.github/workflows/cpu_local_marqo.yml b/.github/workflows/cpu_local_marqo.yml
@@ -64,7 +64,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
           cache: "pip"
diff --git a/.github/workflows/cuda_docker_marqo.yml b/.github/workflows/cuda_docker_marqo.yml
@@ -55,7 +55,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
           cache: "pip"
diff --git a/.github/workflows/cuda_docker_marqo_split.yml b/.github/workflows/cuda_docker_marqo_split.yml
@@ -65,7 +65,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
           cache: "pip"
diff --git a/.github/workflows/integration_tests_CI.yml b/.github/workflows/integration_tests_CI.yml
@@ -135,7 +135,7 @@ jobs:
           path: marqo
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
           cache: "pip"
diff --git a/.github/workflows/integration_tests_with_shards_and_replicas.yml b/.github/workflows/integration_tests_with_shards_and_replicas.yml
@@ -19,14 +19,6 @@ permissions:
   contents: read
 
 jobs:
-  Unit-Tests-1-Shard-0-Replica:
-    uses: ./.github/workflows/integration_tests_CI.yml
-    secrets: inherit
-    if: github.event_name == 'workflow_dispatch' || github.event.review.state == 'approved'
-    with:
-        number_of_shards: 1
-        number_of_replicas: 0
-
   Unit-Tests-1-Shard-1-Replica:
     uses: ./.github/workflows/integration_tests_CI.yml
     secrets: inherit
diff --git a/.github/workflows/largemodel_integration_tests_CI.yml b/.github/workflows/largemodel_integration_tests_CI.yml
@@ -94,7 +94,7 @@ jobs:
           path: marqo
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
           cache: "pip"
diff --git a/.github/workflows/locust_perf_test.yml b/.github/workflows/locust_perf_test.yml
@@ -98,7 +98,7 @@ jobs:
           ref: ${{ github.event.inputs.marqo_ref }}
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/run_required_checks.yml b/.github/workflows/run_required_checks.yml
@@ -20,14 +20,40 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          path: marqo
 
       - name: Check for Non-Markdown Changes
         id: check_changes
         run: |
-          if git diff --name-only ${{ github.event.before }} ${{ github.sha }} | grep -vE '\.md$'; then
-            echo "non_documentation_changes_found=true" >> $GITHUB_OUTPUT
+          cd marqo
+          set -x
+          
+          # Determine BASE_COMMIT and HEAD_COMMIT based on the event type
+          if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
+            BASE_COMMIT=${{ github.event.pull_request.base.sha }}
+            HEAD_COMMIT=${{ github.event.pull_request.head.sha }}
+          elif [[ "${GITHUB_EVENT_NAME}" == "push" ]]; then
+            BASE_COMMIT=${{ github.event.before }}
+            HEAD_COMMIT=${{ github.sha }}
+          elif [[ "${GITHUB_EVENT_NAME}" == "workflow_dispatch" ]]; then
+            # For manual dispatch, we always run the tests
+            echo "non_documentation_changes_found=true" >> "$GITHUB_OUTPUT"
+            exit 0
           else
-            echo "non_documentation_changes_found=false" >> $GITHUB_OUTPUT
+            echo "Unsupported event: ${GITHUB_EVENT_NAME}"
+            exit 1
+          fi
+
+          # Debug: Print base and head commits
+          echo "Base commit: $BASE_COMMIT"
+          echo "Head commit: $HEAD_COMMIT"
+
+          # Perform the diff to check for non-documentation changes
+          if git diff --name-only $BASE_COMMIT $HEAD_COMMIT -- | grep -vE '\.(md)$'; then
+            echo "non_documentation_changes_found=true" >> "$GITHUB_OUTPUT"
+          else
+
+            echo "non_documentation_changes_found=false" >> "$GITHUB_OUTPUT"
           fi
 
   Run-integration-tests:
@@ -39,4 +65,21 @@ jobs:
       number_of_replicas: 0
     secrets: inherit
 
+  # GitHub status will rely on the result of this step to determine if the PR is ready for merge
+  Report-required-test-status:
+    needs: [ Determine-changes, Run-integration-tests ]
+    runs-on: ubuntu-latest
+    if: always()
+    steps:
+      - name: Set integration test status
+        run: |
+          if [[ "${{ needs.Determine-changes.outputs.non_documentation_changes_found }}" == "false" ]]; then
+            echo "Integration tests skipped due to markdown-only changes."
+          elif [[ "${{ needs.Run-integration-tests.result }}" == "success" ]]; then
+            echo "Integration tests completed successfully."
+          else
+            echo "Integration tests failed or did not run."
+            exit 1
+          fi
+
   # TODO: Add more jobs here as needed
diff --git a/.github/workflows/test_documentation.yml b/.github/workflows/test_documentation.yml
@@ -28,7 +28,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
           cache: "pip"
diff --git a/.github/workflows/test_patches_merged.yml b/.github/workflows/test_patches_merged.yml
@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -32,7 +32,7 @@ jobs:
           path: marqo
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
           cache: "pip"
