Merge branch 'main' into 82-javalin-sample

Author: raphaeltm

README.md

@@ -3,3 +3,7 @@
 Samples to show you how to develop, deploy, and debug cloud applications with Defang.
 
 Browse through the [./samples](./samples) directory, or search and browse in the [docs](https://docs.defang.io/docs/samples).
+
+## Adding Samples
+
+To start working on a new sample, run `. ./scripts/new-sample.sh` from the root of the repository. This will create a new sample directory, with some basic scaffolding to get you started. Look for `#REMOVE_ME_AFTER_EDITING` in your new project to look for things that you should probably be changing/checking per sample. Feel free to remove files, like `compose.dev.yaml` if they aren't necessary for your sample.

samples/angular-express/.github/workflows/deploy.yaml

@@ -1,14 +1,9 @@
-name: deploy
+name: Deploy
 
 on:
   push:
     branches:
       - main
-      - pr-test/*
-
-concurrency:
-  group: deploy
-  cancel-in-progress: false
 
 jobs:
   deploy:
@@ -21,11 +16,5 @@ jobs:
     - name: Checkout Repo
       uses: actions/checkout@v4
 
-    - name: Install defang
-      run: . <(curl -Ls https://s.defang.io/install)
-
-    - name: Login to Defang
-      run: defang login
-
     - name: Deploy
-      run: defang compose up -v --detach
+      uses: DefangLabs/defang[email protected]

samples/bullmq-bullboard-redis/.github/workflows/deploy.yaml

@@ -1,14 +1,9 @@
-name: deploy
+name: Deploy
 
 on:
   push:
     branches:
       - main
-      - pr-test/*
-
-concurrency:
-  group: deploy
-  cancel-in-progress: false
 
 jobs:
   deploy:
@@ -21,11 +16,5 @@ jobs:
     - name: Checkout Repo
       uses: actions/checkout@v4
 
-    - name: Install defang
-      run: . <(curl -Ls https://s.defang.io/install)
-
-    - name: Login to Defang
-      run: defang login
-
     - name: Deploy
-      run: defang compose up -v --detach
+      uses: DefangLabs/defang[email protected]

samples/csharp-dotnet/.github/workflows/deploy.yaml

@@ -0,0 +1,20 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+
+    steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v4
+
+    - name: Deploy
+      uses: DefangLabs/[email protected]

samples/django-postgres/.github/workflows/deploy.yaml

@@ -1,14 +1,9 @@
-name: deploy
+name: Deploy
 
 on:
   push:
     branches:
       - main
-      - pr-test/*
-
-concurrency:
-  group: deploy
-  cancel-in-progress: false
 
 jobs:
   deploy:
@@ -21,11 +16,5 @@ jobs:
     - name: Checkout Repo
       uses: actions/checkout@v4
 
-    - name: Install defang
-      run: . <(curl -Ls https://s.defang.io/install)
-
-    - name: Login to Defang
-      run: defang login
-
     - name: Deploy
-      run: defang compose up -v --detach
+      uses: DefangLabs/defang[email protected]

samples/django/.github/workflows/deploy.yaml

@@ -1,14 +1,9 @@
-name: deploy
+name: Deploy
 
 on:
   push:
     branches:
       - main
-      - pr-test/*
-
-concurrency:
-  group: deploy
-  cancel-in-progress: false
 
 jobs:
   deploy:
@@ -21,11 +16,5 @@ jobs:
     - name: Checkout Repo
       uses: actions/checkout@v4
 
-    - name: Install defang
-      run: . <(curl -Ls https://s.defang.io/install)
-
-    - name: Login to Defang
-      run: defang login
-
     - name: Deploy
-      run: defang compose up -v --detach
+      uses: DefangLabs/defang[email protected]

samples/elysia/.github/workflows/deploy.yaml

@@ -1,14 +1,9 @@
-name: deploy
+name: Deploy
 
 on:
   push:
     branches:
       - main
-      - pr-test/*
-
-concurrency:
-  group: deploy
-  cancel-in-progress: false
 
 jobs:
   deploy:
@@ -21,11 +16,5 @@ jobs:
     - name: Checkout Repo
       uses: actions/checkout@v4
 
-    - name: Install defang
-      run: . <(curl -Ls https://s.defang.io/install)
-
-    - name: Login to Defang
-      run: defang login
-
     - name: Deploy
-      run: defang compose up -v --detach
+      uses: DefangLabs/defang[email protected]

samples/fastapi-postgres/.github/workflows/deploy.yaml

@@ -1,14 +1,9 @@
-name: deploy
+name: Deploy
 
 on:
   push:
     branches:
       - main
-      - pr-test/*
-
-concurrency:
-  group: deploy
-  cancel-in-progress: false
 
 jobs:
   deploy:
@@ -21,11 +16,5 @@ jobs:
     - name: Checkout Repo
       uses: actions/checkout@v4
 
-    - name: Install defang
-      run: . <(curl -Ls https://s.defang.io/install)
-
-    - name: Login to Defang
-      run: defang login
-
     - name: Deploy
-      run: defang compose up -v --detach
+      uses: DefangLabs/defang[email protected]

samples/fastapi/.github/workflows/deploy.yaml

@@ -1,14 +1,9 @@
-name: deploy
+name: Deploy
 
 on:
   push:
     branches:
       - main
-      - pr-test/*
-
-concurrency:
-  group: deploy
-  cancel-in-progress: false
 
 jobs:
   deploy:
@@ -21,11 +16,5 @@ jobs:
     - name: Checkout Repo
       uses: actions/checkout@v4
 
-    - name: Install defang
-      run: . <(curl -Ls https://s.defang.io/install)
-
-    - name: Login to Defang
-      run: defang login
-
     - name: Deploy
-      run: defang compose up -v --detach
+      uses: DefangLabs/defang[email protected]

samples/feathersjs/.github/workflows/deploy.yaml

@@ -0,0 +1,20 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+
+    steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v4
+
+    - name: Deploy
+      uses: DefangLabs/[email protected]