wip: testing

input-output-hk · Sep 4, 2024 · 51bb927 · 51bb927
1 parent d740403
commit 51bb927
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 25 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,31 +28,30 @@ jobs:
             ^test.*
             publish
 
-  # check:
-  #   uses: ./.github/workflows/run.yml
-  #   needs: [discover]
-  #   with:
-  #     earthfiles: ${{ toJson(fromJson(needs.discover.outputs.result)['^check.*']) }}
-  #     forge_version: ${{ inputs.forge_version }}
+  check:
+    uses: ./.github/workflows/run.yml
+    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 }}
+  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 }}
+  test:
+    uses: ./.github/workflows/run.yml
+    needs: [discover, check, build]
+    with:
+      earthfiles: ${{ toJson(fromJson(needs.discover.outputs.result)['^test.*']) }}
+      forge_version: ${{ inputs.forge_version }}
 
   publish:
     uses: ./.github/workflows/publish.yml
-    #needs: [discover, check, build, test]
-    needs: [discover]
+    needs: [discover, check, build, test]
     with:
       earthfiles: ${{ toJson(fromJson(needs.discover.outputs.result)['publish']) }}
       forge_version: ${{ inputs.forge_version }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -33,6 +33,7 @@ jobs:
           path: ${{ matrix.earthfile }}
       - name: Get image and project
         id: image
+        if: github.ref_name == github.event.repository.default_branch
         run: |
           EARTHFILE='${{ matrix.earthfile }}'
           PROJECT="${EARTHFILE%+*}"
@@ -55,6 +56,7 @@ jobs:
           echo "project=$PROJECT" >> $GITHUB_OUTPUT
       - name: Publish
         uses: ./forge/actions/publish
+        if: github.ref_name == github.event.repository.default_branch
         with:
           image: ${{ steps.image.outputs.image }}
           project: ${{ steps.image.outputs.project }}
diff --git a/forge/actions/publish/dist/index.js b/forge/actions/publish/dist/index.js
diff --git a/forge/actions/publish/dist/index.js.map b/forge/actions/publish/dist/index.js.map
diff --git a/forge/actions/publish/src/main.js b/forge/actions/publish/src/main.js
@@ -66,7 +66,7 @@ async function run() {
         await tagImage(image, taggedImage);
 
         core.info(`Pushing image ${taggedImage}`);
-        //await pushImage(taggedImage);
+        await pushImage(taggedImage);
       }
     }
   } catch (error) {
@@ -162,7 +162,7 @@ function parseGitMonorepoTag(tag, project, aliases) {
     if (path === project) {
       return monoTag;
     } else {
-      core.info(`Skipping tag as it does not match the project path`);
+      core.info(`Skipping tag as it does not match the project`);
       return "";
     }
   } else {