CI fixes

Author: lionello

.github/workflows/build-samples-json.yml

@@ -2,7 +2,8 @@ name: Trigger Docs Samples Rebuild
 
 on:
   push:
-    branches: main
+    branches:
+      - main
     paths:
       - 'samples/**'
 

.github/workflows/check-sample.yml

@@ -25,18 +25,14 @@ jobs:
       - name: Run Checks
         id: checks
         run: |
-          eval "$(curl -fsSL s.defang.io/install)"
           ./scripts/check-sample-files.sh > checklist.txt
           ./scripts/check-modified-samples.sh > modified.txt
           echo "@@ MODIFIED @@"
           cat modified.txt
 
-      # TODO: Uncomment the following lines to validate the Compose files
-      #       once we figure out how to prevent it from erroring on warnings.
-      # - name: Validate Compose Files with Defang CLI
-      #   run: |
-      #     eval "$(curl -fsSL s.defang.io/install)"
-      #     cat modified.txt | xargs -n1 defang compose config -C > /dev/null
+      - name: Validate Compose Files with Defang CLI
+        run: |
+          cat modified.txt | xargs --no-run-if-empty -n1  defang compose config -C
 
       - name: Add checklist to PR description
         uses: actions/github-script@v5

.github/workflows/publish-sample-template.yml

@@ -1,14 +1,18 @@
 name: Publish Sample Template
 
 on:
-  push: 
+  push:
     branches:
       - main
+    paths:
+      - 'samples/**'
+      - 'scripts/template-manager.js'
+      - 'scripts/check-modified-samples.sh'
 
 jobs:
   publish_samples:
     runs-on: ubuntu-latest
-    permissions: 
+    permissions:
       contents: write
       pull-requests: write
     steps:

tools/testing/deployer/deployer.go

@@ -319,6 +319,7 @@ func (d *CliDeployer) Cleanup(ctx context.Context) error {
 }
 
 func (d *CliDeployer) RunCommand(ctx context.Context, opt func(*exec.Cmd), command string, args ...string) (*exec.Cmd, error) {
+	log.Printf("Running command in dir %q: %q %q", d.WorkDir, command, args)
 	cmd := exec.CommandContext(ctx, command, args...)
 	cmd.Env = d.EnvVars
 	if d.WorkDir != "" {