From 6fe1c46ddfdc41bcb1462ca44e8f41ed92c92012 Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Thu, 28 Mar 2024 12:22:23 -0400
Subject: [PATCH] Tweaks for CI

---
 azure-pipelines.yml | 55 +++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1f129b978df0..9f056d752cbf 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,11 +2,11 @@
 trigger:
   branches:
     include:
-      - '*'
+    - '*'
 pr:
   branches:
     include:
-      - '*'
+    - '*'
 
 jobs:
 
@@ -898,30 +898,6 @@ jobs:
     continueOnError: true
     displayName: test-jspecify.sh
 
-  - job: cfinference_jdk8
-    dependsOn:
-      - junit_tests_jdk11
-      - nonjunit_tests_jdk11
-      #   - misc_jdk11
-      - typecheck_jdk11
-      - cfinference_jdk11
-    pool:
-      vmImage: 'ubuntu-latest'
-    container: xingweitian/ubuntu-for-cfi-jdk8:latest
-    steps:
-      - checkout: self
-        fetchDepth: 25
-      - bash: ./checker/bin-devel/test-cf-inference.sh
-        displayName: test-cf-inference.sh
-  - job: cfinference_jdk11
-    pool:
-      vmImage: 'ubuntu-latest'
-    container: xingweitian/ubuntu-for-cfi-jdk11:latest
-    steps:
-      - checkout: self
-        fetchDepth: 25
-      - bash: ./checker/bin-devel/test-cf-inference.sh
-        displayName: test-cf-inference.sh
 
 ## The downstream jobs are not currently needed because test-downstream.sh is empty.
 # - job: downstream_jdk8
@@ -982,4 +958,29 @@ jobs:
 #   - checkout: self
 #     fetchDepth: 25
 #   - bash: ./checker/bin-devel/test-downstream.sh
-#     displayName: test-downstream.sh
\ No newline at end of file
+#     displayName: test-downstream.sh
+
+  - job: cfinference_jdk8
+    dependsOn:
+      - junit_tests_jdk11
+      - nonjunit_tests_jdk11
+      #   - misc_jdk11
+      - typecheck_jdk11
+      - cfinference_jdk11
+    pool:
+      vmImage: 'ubuntu-latest'
+    container: xingweitian/ubuntu-for-cfi-jdk8:latest
+    steps:
+      - checkout: self
+        fetchDepth: 25
+      - bash: ./checker/bin-devel/test-cf-inference.sh
+        displayName: test-cf-inference.sh
+  - job: cfinference_jdk11
+    pool:
+      vmImage: 'ubuntu-latest'
+    container: xingweitian/ubuntu-for-cfi-jdk11:latest
+    steps:
+      - checkout: self
+        fetchDepth: 25
+      - bash: ./checker/bin-devel/test-cf-inference.sh
+        displayName: test-cf-inference.sh
\ No newline at end of file