Browse Source

[tests] Only run legacy tests with -D include_legacy (#12152)

CI still runs legacy tests all the time
Rudy Ges 3 months ago
parent
commit
1680bcdc5a

+ 4 - 4
.github/workflows/main.yml

@@ -294,7 +294,7 @@ jobs:
         run: export DISPLAY=:99.0
 
       - name: Test
-        run: haxe RunCi.hxml
+        run: haxe RunCi.hxml -D include_legacy
         working-directory: ${{github.workspace}}/tests
         timeout-minutes: 20
 
@@ -531,7 +531,7 @@ jobs:
           sudo apt install -qqy ${{matrix.APT_PACKAGES}}
 
       - name: Test
-        run: haxe RunCi.hxml
+        run: haxe RunCi.hxml -D include_legacy
         working-directory: ${{github.workspace}}/tests
         timeout-minutes: 20
 
@@ -741,7 +741,7 @@ jobs:
 
       - name: Test
         shell: pwsh
-        run: haxe RunCi.hxml
+        run: haxe RunCi.hxml -D include_legacy
         working-directory: ${{github.workspace}}/tests
         timeout-minutes: 20
 
@@ -852,7 +852,7 @@ jobs:
         run: |
           # disable invalid Unicode filenames on APFS
           echo "" > sys/compile-fs.hxml
-          haxe RunCi.hxml
+          haxe RunCi.hxml -D include_legacy
         working-directory: ${{github.workspace}}/tests
         timeout-minutes: 60
 

+ 1 - 1
extra/github-actions/test-mac.yml

@@ -28,6 +28,6 @@
   run: |
     # disable invalid Unicode filenames on APFS
     echo "" > sys/compile-fs.hxml
-    haxe RunCi.hxml
+    haxe RunCi.hxml -D include_legacy
   working-directory: ${{github.workspace}}/tests
   timeout-minutes: 60

+ 1 - 1
extra/github-actions/test-windows.yml

@@ -60,6 +60,6 @@
 
 - name: Test
   shell: pwsh
-  run: haxe RunCi.hxml
+  run: haxe RunCi.hxml -D include_legacy
   working-directory: ${{github.workspace}}/tests
   timeout-minutes: 20

+ 2 - 2
extra/github-actions/workflows/main.yml

@@ -177,7 +177,7 @@ jobs:
         run: export DISPLAY=:99.0
 
       - name: Test
-        run: haxe RunCi.hxml
+        run: haxe RunCi.hxml -D include_legacy
         working-directory: ${{github.workspace}}/tests
         timeout-minutes: 20
 
@@ -360,7 +360,7 @@ jobs:
           sudo apt install -qqy ${{matrix.APT_PACKAGES}}
 
       - name: Test
-        run: haxe RunCi.hxml
+        run: haxe RunCi.hxml -D include_legacy
         working-directory: ${{github.workspace}}/tests
         timeout-minutes: 20
 

+ 3 - 0
tests/runci/targets/Macro.hx

@@ -10,7 +10,10 @@ class Macro {
 
 		changeDirectory(displayDir);
 		haxelibInstallGit("Simn", "haxeserver");
+
+		#if include_legacy
 		runCommand("haxe", ["build.hxml", "-D", "display.protocol=xml"]);
+		#end
 		runCommand("haxe", ["build.hxml", "-D", "display.protocol=jsonrpc"]);
 
 		changeDirectory(sourcemapsDir);