Upgrade Dgraph, Spark and Python versions in CI (#278)

EnricoMi · web-flow · commit b336e310ff87 · 2025-04-29T22:47:30.000+02:00
## Checklist before submitting - [x] Did you read the [contributing guide](https://github.com/G-Research/spark-dgraph-connector/blob/contributing-guidelines/CONTRIBUTING.md)? - [ ] Did you update the docs? - [ ] Did you write any tests to validate this change? ## Description Upgrades DGraph, Spark and Python versions in CI. ## Review process for approval 1. All tests and other checks must succeed. 2. At least one core contributors must review and approve. 3. If a core contributor requests changes, they must be addressed.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -78,6 +78,7 @@ jobs:
           - dgraph-version: "22.0.2"
           - dgraph-version: "23.1.1"
           - dgraph-version: "24.0.5"
+          - dgraph-version: "24.1.2"
     uses: "./.github/workflows/test-spark.yml"
     with:
       dgraph-version: ${{ matrix.dgraph-version }}
@@ -97,31 +98,31 @@ jobs:
               "scala-compat-version": "2.13",
               "scala-version": "2.13.5",
               "java-version": "11",
-              "dgraph-version": "24.0.5"
+              "dgraph-version": "24.1.2"
             },
             {
               "spark-version": "3.3.4",
               "spark-compat-version": "3.3",
               "scala-compat-version": "2.13",
               "scala-version": "2.13.8",
               "java-version": "11",
-              "dgraph-version": "24.0.5"
+              "dgraph-version": "24.1.2"
             },
             {
-              "spark-version": "3.4.3",
+              "spark-version": "3.4.4",
               "spark-compat-version": "3.4",
               "scala-compat-version": "2.13",
               "scala-version": "2.13.8",
               "java-version": "11",
-              "dgraph-version": "24.0.5"
+              "dgraph-version": "24.1.2"
             },
             {
-              "spark-version": "3.5.3",
+              "spark-version": "3.5.5",
               "spark-compat-version": "3.5",
               "scala-compat-version": "2.13",
               "scala-version": "2.13.8",
               "java-version": "11",
-              "dgraph-version": "24.0.5"
+              "dgraph-version": "24.1.2"
             }
           ]
         }
diff --git a/.github/workflows/download-spark.yml b/.github/workflows/download-spark.yml
@@ -21,9 +21,9 @@ jobs:
             hadoop-version: '2.7'
           - spark-version: '3.3.4'
             hadoop-version: '3'
-          - spark-version: '3.4.3'
+          - spark-version: '3.4.4'
             hadoop-version: '3'
-          - spark-version: '3.5.3'
+          - spark-version: '3.5.5'
             hadoop-version: '3'
           - spark-version: '4.0.0-preview2'
             hadoop-version: '3'
diff --git a/.github/workflows/test-dgraph.yml b/.github/workflows/test-dgraph.yml
@@ -20,12 +20,14 @@ jobs:
             "22.0.0", "22.0.1", "22.0.2",
             "23.0.0", "23.0.1",
             "23.1.0", "23.1.1",
-            "24.0.0", "24.0.1", "24.0.2", "24.0.4", "24.0.5"
+            "24.0.0", "24.0.1", "24.0.2", "24.0.4", "24.0.5",
+            "24.1.0", "24.1.1", "24.1.2",
+            "25.0.0-preview1"
         ]
         scala-compat-version: ["2.12"]
         include:
           - spark-compat-version: '3.5'
-            spark-version: '3.5.3'
+            spark-version: '3.5.5'
             scala-compat-version: '2.12'
             scala-version: '2.12.18'
 
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -12,52 +12,52 @@ jobs:
       fail-fast: false
       matrix:
         spark-compat-version: ["3.4", "3.5", "4.0"]
-        dgraph-minor-version: ["20.03", "20.07", "20.11", "21.12", "22.0", "23.0", "23.1", "24.0"]
+        dgraph-minor-version: ["20.03", "20.07", "20.11", "21.12", "22.0", "23.0", "23.1", "24.0", "24.1"]
         include:
           - spark-compat-version: '3.0'
             spark-version: '3.0.3'
             scala-compat-version: '2.12'
             scala-version: '2.12.10'
             java-version: 11
-            dgraph-minor-version: "24.0"
-            dgraph-version: "24.0.5"
+            dgraph-minor-version: "24.1"
+            dgraph-version: "24.1.2"
             hadoop-version: '2.7'
 
           - spark-compat-version: '3.1'
             spark-version: '3.1.3'
             scala-compat-version: '2.12'
             scala-version: '2.12.10'
             java-version: 11
-            dgraph-minor-version: "24.0"
-            dgraph-version: "24.0.5"
+            dgraph-minor-version: "24.1"
+            dgraph-version: "24.1.2"
             hadoop-version: '2.7'
 
           - spark-compat-version: '3.2'
             spark-version: '3.2.4'
             scala-compat-version: '2.12'
             scala-version: '2.12.15'
             java-version: 11
-            dgraph-minor-version: "24.0"
-            dgraph-version: "24.0.5"
+            dgraph-minor-version: "24.1"
+            dgraph-version: "24.1.2"
             hadoop-version: '2.7'
 
           - spark-compat-version: '3.3'
             spark-version: '3.3.4'
             scala-compat-version: '2.12'
             scala-version: '2.12.15'
             java-version: 11
-            dgraph-minor-version: "24.0"
-            dgraph-version: "24.0.5"
+            dgraph-minor-version: "24.1"
+            dgraph-version: "24.1.2"
             hadoop-version: '3'
 
           - spark-compat-version: '3.4'
-            spark-version: '3.4.3'
+            spark-version: '3.4.4'
             scala-compat-version: '2.12'
             scala-version: '2.12.17'
             java-version: 11
             hadoop-version: '3'
           - spark-compat-version: '3.5'
-            spark-version: '3.5.3'
+            spark-version: '3.5.5'
             scala-compat-version: '2.12'
             scala-version: '2.12.18'
             java-version: 11
@@ -85,6 +85,8 @@ jobs:
             dgraph-version: "23.1.1"
           - dgraph-minor-version: "24.0"
             dgraph-version: "24.0.5"
+          - dgraph-minor-version: "24.1"
+            dgraph-version: "24.1.2"
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml
@@ -13,11 +13,11 @@ jobs:
       matrix:
         spark-compat-version: ["3.5"]
         scala-compat-version: ["2.12"]
-        dgraph-minor-version: ["21.12", "22.0", "23.0", "23.1", "24.0"]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        dgraph-minor-version: ["21.12", "22.0", "23.0", "23.1", "24.0", "24.1"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         include:
           - spark-compat-version: '3.5'
-            spark-version: '3.5.3'
+            spark-version: '3.5.5'
             scala-compat-version: '2.12'
             scala-version: '2.12.18'
 
@@ -31,6 +31,8 @@ jobs:
             dgraph-version: "23.1.1"
           - dgraph-minor-version: "24.0"
             dgraph-version: "24.0.5"
+          - dgraph-minor-version: "24.1"
+            dgraph-version: "24.1.2"
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/test-spark.yml b/.github/workflows/test-spark.yml
@@ -22,9 +22,9 @@ jobs:
             "3.2.4",
             "3.3.4",
             # we test all patch version of current supported minor releases
-            "3.4.0", "3.4.1", "3.4.2",
+            "3.4.0", "3.4.1", "3.4.2", "3.4.3",
             # latest patch version tested in test-dgraph, not testes here again
-            "3.5.0", "3.5.1",
+            "3.5.0", "3.5.1", "3.5.2", "3.5.3", "3.5.4",
             "4.0.0-preview2"
         ]
         include:
@@ -67,6 +67,11 @@ jobs:
             scala-compat-version: "2.12"
             scala-version: "2.12.17"
             java-version: 11
+          - spark-version: "3.4.3"
+            spark-compat-version: "3.4"
+            scala-compat-version: "2.12"
+            scala-version: "2.12.17"
+            java-version: 11
 
           - spark-version: "3.5.0"
             spark-compat-version: "3.5"
@@ -78,6 +83,21 @@ jobs:
             scala-compat-version: "2.12"
             scala-version: "2.12.18"
             java-version: 11
+          - spark-version: "3.5.2"
+            spark-compat-version: "3.5"
+            scala-compat-version: "2.12"
+            scala-version: "2.12.18"
+            java-version: 11
+          - spark-version: "3.5.3"
+            spark-compat-version: "3.5"
+            scala-compat-version: "2.12"
+            scala-version: "2.12.18"
+            java-version: 11
+          - spark-version: "3.5.4"
+            spark-compat-version: "3.5"
+            scala-compat-version: "2.12"
+            scala-version: "2.12.18"
+            java-version: 11
 
           - spark-version: "4.0.0-preview2"
             spark-compat-version: "4.0"
diff --git a/dgraph-instance.start.sh b/dgraph-instance.start.sh
@@ -1,6 +1,6 @@
 # keep env var name in-sync with uk.co.gresearch.spark.dgraph.DgraphTestCluster.DgraphVersionEnvVar
 # keep default value in-sync with uk.co.gresearch.spark.dgraph.DgraphTestCluster.DgraphDefaltVersion
-version=${DGRAPH_TEST_CLUSTER_VERSION:-24.0.2}
+version=${DGRAPH_TEST_CLUSTER_VERSION:-24.1.2}
 
 if [[ $version < "21.03.0" ]]
 then
