Use CURRENT_PLATFORM as mx report suffix while running in GITHUB_CI

Fix merge reports
TMP: Set retagger gate job goal to linux amd64/aarch64 on all batches

Author: Ariouz

.github/workflows/ci-unittest-retagger.yml

@@ -8,33 +8,44 @@ jobs:
   run-retagger:
     uses: ./.github/workflows/ci-matrix-gen.yml
     with:
-      jobs_to_run: python-svm-build-gate-linux|python-unittest-retagger-gate-batch1
+      jobs_to_run: python-svm-build-gate-linux|python-unittest-retagger-gate
 
   merge_all_reports:
     runs-on: ubuntu-latest
     needs: run-retagger
     if: ${{ success() }}
     steps: 
+
+      - name: Actions/Checkout
+        uses: actions/checkout@main
+        with:
+          path: main
+
       - name: Download reports
         uses: actions/download-artifact@v5
         with:
           pattern: python-unittest-retagger*
           merge-multiple: true
         continue-on-error: true
+
       - name: Merge retagger reports
         working-directory: main
         run: |
-          mkdir -p ../retagger-reports
-          sh -c mv retagger-report*.json ../retagger-reports
-          cd ../retagger-reports
-          python3 ../main/.github/scripts/merge_retagger_results.py
-          cd ../main
-          python3 ./graalpython/com.oracle.graal.python.test/src/runner.py merge-tags-from-report ../retagger-reports/reports-merged.json
-          sh -c git diff >> reports_diff
+          mkdir -p ../retagger-reports ../diffs
+          ls && ls ..
+          mv retagger-report*.json ../retagger-reports
+
+          declare -a os_list=("linux-x86_64" "linux-aarch64" "darwin-x86_64" "windows-x86_64")
+          for os in "${os_list[@]}"; do
+            echo "Merging tags for $os"
+            python3 .github/scripts/merge_retagger_results.py --dir ../retagger-reports --outfile "../retagger-reports/reports-merged-$os.json" --pattern "*$os*" || true
+            python3 graalpython/com.oracle.graal.python.test/src/runner.py merge-tags-from-report "../retagger-reports/reports-merged-$os.json" --platform "$os" || true
+            git diff > "../diffs/reports_diff-$os" || true
+          done
 
       - name: Export reports diff file
         uses: actions/upload-artifact@v5
         with:
           name: retagger.diff
-          path: main/diff_reports
-          retention-days: 1
+          path: diffs/reports_diff*
+          retention-days: 15

ci/graal/common.json

@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.67.0",
+  "mx_version": "7.68.4",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
@@ -49,12 +49,12 @@
     "graalvm-ee-25-ea":   {"name": "graalvm-jdk", "version": "25.0.0", "ea": "36", "platformspecific": true },
 
     "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25.0.1+8", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b10", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b10-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b10-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b10", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b10-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b10-sulong", "platformspecific": true }
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b11", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b11-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b11-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b11", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b11-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b11-sulong", "platformspecific": true }
   },
 
   "eclipse": {
@@ -69,4 +69,4 @@
     "pylint": "==2.4.4",
     "black": "==23.11.0"
   }
-}
+}

ci/python-gate.libsonnet

@@ -341,7 +341,7 @@
             environment+: {
                 TAGGED_UNITTEST_PARTIAL: "%d/%d" % [i, num],
                 RETAGGER_BATCH_NO: i,
-                MX_REPORT_SUFFIX: "_batch_%d_%s-%s" % [i, self.os, self.arch],
+                MX_REPORT_SUFFIX: "_batch_%d" % [i],
             },
             variations+::["batch" + i]
         }),

graalpython/com.oracle.graal.python.test/src/runner.py

@@ -449,6 +449,8 @@ def generate_mx_report(self, path: str):
         # Some reports may be split when ran on github, this sets different file names
         report_suffix = os.environ.get("MX_REPORT_SUFFIX")
         if report_suffix:
+            if os.environ.get("GITHUB_CI"):
+                report_suffix = f"{report_suffix}_{CURRENT_PLATFORM}"
             tmppath, ext = os.path.splitext(path)
             path = f"{tmppath}{report_suffix}{ext}"
 

mx.graalpython/suite.py

@@ -53,15 +53,15 @@
             },
             {
                 "name": "tools",
-                "version": "4eaa61399415a2602c8fca5a3efb2d5145c20b8b",
+                "version": "e61a4623b7fc839ee10df84050c120d59056b871",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "regex",
-                "version": "4eaa61399415a2602c8fca5a3efb2d5145c20b8b",
+                "version": "e61a4623b7fc839ee10df84050c120d59056b871",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},