wip: fixes ordering

input-output-hk · Sep 20, 2024 · 2da2388 · 2da2388
1 parent 76eb368
commit 2da2388
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -52,8 +52,8 @@ jobs:
           filters: |
             ^check(-.*+)?$
             ^build(-.*+)?$
-            ^test(-.*+)?$
             ^package(-.*+)?$
+            ^test(-.*+)?$
             ^release(-.*+)?$
             ^publish(-.*+)?$
 
@@ -75,20 +75,20 @@ jobs:
     secrets:
       earthly_token: ${{ secrets.earthly_token }}
 
-  test:
+  package:
     uses: ./.github/workflows/run.yml
     needs: [discover, check, build]
     with:
-      earthfiles: ${{ toJson(fromJson(needs.discover.outputs.result)['^test(-.*+)?$']) }}
+      earthfiles: ${{ toJson(fromJson(needs.discover.outputs.result)['^package(-.*+)?$']) }}
       forge_version: ${{ inputs.forge_version }}
     secrets:
       earthly_token: ${{ secrets.earthly_token }}
 
-  package:
+  test:
     uses: ./.github/workflows/run.yml
-    needs: [discover, check, build]
+    needs: [discover, check, build, package]
     with:
-      earthfiles: ${{ toJson(fromJson(needs.discover.outputs.result)['^package(-.*+)?$']) }}
+      earthfiles: ${{ toJson(fromJson(needs.discover.outputs.result)['^test(-.*+)?$']) }}
       forge_version: ${{ inputs.forge_version }}
     secrets:
       earthly_token: ${{ secrets.earthly_token }}

diff --git a/blueprint.cue b/blueprint.cue
@@ -4,8 +4,8 @@ global: {
 		local: [
 			"^check(-.*+)?$",
 			"^build(-.*+)?$",
-			"^test(-.*+)?$",
 			"^package(-.*+)?$",
+			"^test(-.*+)?$",
 			"^release(-.*+)?$",
 			"^publish(-.*+)?$",
 		]