wip: cleanup

.github/workflows/test.yml → .github/workflows/ci.yml

@@ -1,10 +1,11 @@
-name: Test
 on:
-  push:
-
-permissions:
-  contents: read
-  id-token: write
+  workflow_call:
+    inputs:
+      forge_version:
+        description: |
+          The version of the forge CLI to install (use 'local' for testing)
+        required: true
+        type: string
 
 jobs:
   discover:
@@ -16,7 +17,7 @@ jobs:
       - name: Setup
         uses: ./forge/actions/setup
         with:
-          forge_version: local
+          forge_version: ${{ inputs.forge_version }}
       - name: Discovery
         id: discovery
         uses: ./forge/actions/discovery
@@ -31,15 +32,18 @@ jobs:
     needs: [discover]
     with:
       earthfiles: ${{ toJson(fromJson(needs.discover.outputs.result)['^check.*']) }}
+      forge_version: ${{ inputs.forge_version }}
 
   build:
     uses: ./.github/workflows/run.yml
     needs: [discover, check]
     with:
       earthfiles: ${{ toJson(fromJson(needs.discover.outputs.result)['^build.*']) }}
+      forge_version: ${{ inputs.forge_version }}
 
   test:
     uses: ./.github/workflows/run.yml
     needs: [discover, check, build]
     with:
       earthfiles: ${{ toJson(fromJson(needs.discover.outputs.result)['^test.*']) }}
+      forge_version: ${{ inputs.forge_version }}

.github/workflows/dogfood.yml

@@ -0,0 +1,15 @@
+name: Dogfood
+
+on:
+  push:
+
+permissions:
+  id-token: write
+  contents: write
+  packages: write
+
+jobs:
+  ci:
+    uses: ./.github/workflows/ci.yml
+    with:
+      forge_version: local

.github/workflows/run.yml

@@ -6,6 +6,11 @@ on:
           A JSON list of Earthfile paths+targets to run
         required: true
         type: string
+      forge_version:
+        description: |
+          The version of the forge CLI to install (use 'local' for testing)
+        required: true
+        type: string
 
 jobs:
   run:
@@ -20,7 +25,7 @@ jobs:
       - name: Setup CI
         uses: ./forge/actions/setup
         with:
-          forge_version: local
+          forge_version: ${{ inputs.forge_version }}
       - name: Run
         uses: ./forge/actions/run
         with: