checkout defang and samples in sibling directories

to mirror the configuration in our development environments

Author: jordanstephens

.github/workflows/deploy.yml

@@ -44,14 +44,14 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: DefangLabs/defang
-          path: defang
+          path: ../defang
           ref: ${{ github.event_name == 'repository_dispatch' && github.event.client_payload.version || 'main' }}
 
       - name: Checkout DefangLabs/samples
         uses: actions/checkout@v3
         with:
           repository: DefangLabs/samples
-          path: samples
+          path: ../samples
           ref: main
 
       - name: Set up Go

.github/workflows/test-deploy.yml

@@ -25,14 +25,14 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: DefangLabs/defang
-          path: defang
+          path: ../defang
           ref: main
 
       - name: Checkout DefangLabs/samples
         uses: actions/checkout@v3
         with:
           repository: DefangLabs/samples
-          path: samples
+          path: ../samples
           ref: main
 
       - name: Set up Go

scripts/prebuild.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-cd defang/src/cmd/gendocs && go run main.go ../../../defang-docs/docs/cli
+cd ../defang/src/cmd/gendocs && go run main.go ../../../../defang-docs/docs/cli
 cd -
 node scripts/prep-cli-docs.js
 node scripts/prep-samples.js

scripts/prep-samples.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const YAML = require('yaml');
 
-const samplesDir = path.join(__dirname, '..', 'samples', 'samples');
+const samplesDir = path.join(__dirname, '..', '..', 'samples', 'samples');
 
 // categories are directories in the current directory (i.e. we're running in samples/ and we might have a samples/ruby/ directory)
 const directories = fs.readdirSync(samplesDir).filter(file => fs.statSync(path.join(samplesDir, file)).isDirectory());
@@ -20,11 +20,11 @@ directories.forEach((sample) => {
     }
 
     // The readme should contain lines that start with the following:
-    // Title: 
-    // Short Description: 
-    // Tags: 
-    // Languages: 
-    // 
+    // Title:
+    // Short Description:
+    // Tags:
+    // Languages:
+    //
     // We want to extract the title, short description, tags, and languages from the readme. Tags and languages are comma separated lists.
     const title = readme.match(/Title: (.*)/)[1];
     const shortDescription = readme.match(/Short Description: (.*)/)[1];