CI fixes

.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:

samples/nextjs/app/Dockerfile

@@ -20,4 +20,4 @@ RUN npm run build
 EXPOSE 3000
 
 # Start the app
-CMD ["npm", "start"]
+CMD ["npm", "start"]

samples/nextjs/app/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "next dev",
     "build": "next build",
-    "start": "next start",
+    "start": "exec next start",
     "lint": "next lint"
   },
   "dependencies": {

samples/nextjs/compose.yaml

@@ -1,7 +1,7 @@
 services:
   app:
     restart: unless-stopped
-    # domainname: mydomain.com # if you want to use your own domain
+    # domainname: demo.example.com  # Uncomment to set a specific domain name for the service
     build:
       context: ./app
       dockerfile: Dockerfile
@@ -17,5 +17,5 @@ services:
     deploy:
       resources:
         reservations:
-          cpus: '0.50'
-          memory: 512M
+          cpus: '0.25'
+          memory: 256M

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 != "" {

tools/testing/test/run.go

@@ -101,8 +101,8 @@ func Run(ctx context.Context, test TestInfo) (*ItemResult, error) {
 	// declare variable for url
 	var url string
 
-	// Regular expression to capture an "https://" URL that follows "will be available at:"
-	re := regexp.MustCompile(`will be available at:\s*.*?(https://[^\s]+)`)
+	// Regular expression to capture an "https://" URL that follows "DEPLOYMENT_COMPLETED"
+	re := regexp.MustCompile(`DEPLOYMENT_COMPLETED\s*((?:https?://)?[^\s]+)`)
 
 	// Find the first match in the output string
 	match := re.FindStringSubmatch(outputStr)