revert debug changes

canonical · Aug 16, 2024 · b329789 · b329789
1 parent ce18549
commit b329789
Showing 1 changed file with 15 additions and 41 deletions.
diff --git a/.github/workflows/Test_EICAR_Rock.yaml b/.github/workflows/Test_EICAR_Rock.yaml
@@ -6,50 +6,24 @@ on:
         paths:
             - .github/workflows/Test_EICAR_Rock.yaml
     workflow_dispatch:
-        inputs:
-            oci-archive-name:
-                description: "Filname of built rock image"
-                type: string
-                default: "eicar-rock.rock"
-            rock-repo:
-                description: "Repository to source project file"
-                type: string
-                default: "canonical/rocks-toolbox"
-            rock-repo-commit:
-                description: "Reference to source project file"
-                type: string
-                default: "oci-factory_workflows"
-            rockfile-directory:
-                description: "Path to rockcraft.yaml project file"
-                type: string
-                default: "oci-factory_workflows/rocks/eicar"
-
 
 
 jobs:
     build-rock:
-        runs-on: ubuntu-22.04
-        name: Debug
-        steps:
-            - name: Debug
-              id: test
-              run: |
-                echo '${{ toJSON(inputs) }}'
-
-    #     name: Build Rock
-    #     uses: clay-lake/oci-factory/.github/workflows/Build-Rock.yaml@refactor-workflows
-    #     with:
-    #         oci-archive-name: "${{ inputs.oci-archive-name }}"
-    #         rock-repo: "${{ inputs.rock-repo }}"
-    #         rock-repo-commit: "${{ inputs.rock-repo-commit }}"
-    #         rockfile-directory: "${{ inputs.rockfile-directory }}"
-
-
-    # test-rock:
-    #     name: Test Rock
-    #     uses: clay-lake/oci-factory/.github/workflows/Test-Rock.yaml@refactor-workflows
-    #     needs: [build-rock]
-    #     with:
-    #         oci-archive-name: "${{ inputs.oci-archive-name }}"
+        name: Build Rock
+        uses: clay-lake/oci-factory/.github/workflows/Build-Rock.yaml@refactor-workflows
+        with:
+            oci-archive-name: "eicar-rock.rock"
+            rock-repo: "canonical/rocks-toolbox"
+            rock-repo-commit: "oci-factory_workflows"
+            rockfile-directory: "oci-factory_workflows/rocks/eicar"
+
+
+    test-rock:
+        name: Test Rock
+        uses: clay-lake/oci-factory/.github/workflows/Test-Rock.yaml@refactor-workflows
+        needs: [build-rock]
+        with:
+            oci-archive-name: "${{ inputs.oci-archive-name }}"