Simpllyfy in make

Azure-Samples · Feb 27, 2024 · 3b1aa73 · 3b1aa73
1 parent bce69e9
commit 3b1aa73
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,7 @@
 name: CI
 
 on:
+  workflow_dispatch:
   pull_request:
   push:
     branches:
@@ -38,13 +39,7 @@ jobs:
         with:
           imageName: ghcr.io/azure-samples/chat-with-your-data-solution-accelerator
           cacheFrom: ghcr.io/azure-samples/chat-with-your-data-solution-accelerator
-          runCmd: |
-            make ci && 
-            make azd-login && 
-            azd provision --no-prompt &&
-            azd deploy web --no-prompt
-            azd deploy function --no-prompt &&
-            azd deploy adminweb --no-prompt
+          runCmd: make ci && make deploy
           refFilterForPush: refs/heads/main
           env: |
             AZURE_CLIENT_ID

diff --git a/Makefile b/Makefile
@@ -33,3 +33,10 @@ build-frontend: ## 🏗️ Build the Frontend webapp
 azd-login: ## 🔑 Login to Azure with azd and a SPN
 	@echo -e "\e[34m$@\e[0m" || true
 	@azd auth login --client-id ${AZURE_CLIENT_ID} --client-secret ${AZURE_CLIENT_SECRET} --tenant-id ${AZURE_TENANT_ID}
+
+deploy: azd-login ## 🚀 Deploy everything to Azure
+	@echo -e "\e[34m$@\e[0m" || true
+	@azd provision --no-prompt
+	@azd deploy web --no-prompt
+	@azd deploy function --no-prompt
+	@azd deploy adminweb --no-prompt