update paths to deploy/

microsoft · Aug 3, 2023 · ee84db8 · ee84db8
1 parent 2f760e8
commit ee84db8
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 33 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -12,7 +12,7 @@ dependencies:
 
 # Add 'deployment' label to any change within the 'deploy' directory
 deployment:
-  - deploy/**/*
+  - scripts/deploy/**/*
 
 # Add 'documentation' label to any change of '.md' files
 documentation:

diff --git a/.github/workflows/copilot-chat-package.yml b/.github/workflows/copilot-chat-package.yml
@@ -6,9 +6,9 @@ name: copilot-chat-package
 
 on:
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
   merge_group:
-    branches: [ "main" ]
+    branches: ["main"]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -20,36 +20,36 @@ permissions:
 jobs:
   copilot-chat-package:
     strategy:
-        fail-fast: false
-        matrix:
-          include:
-          - { dotnet: '6.0', configuration: Release, os: ubuntu-latest }
+      fail-fast: false
+      matrix:
+        include:
+          - { dotnet: "6.0", configuration: Release, os: ubuntu-latest }
 
     runs-on: ${{ matrix.os }}
     env:
       NUGET_CERT_REVOCATION_MODE: offline
     steps:
-    - uses: actions/checkout@v3
-      with:
-        clean: true
-        
-    - name: Pull container dotnet/sdk:${{ matrix.dotnet }}
-      run: docker pull mcr.microsoft.com/dotnet/sdk:${{ matrix.dotnet }}
-
-    - name: Package Copilot Chat WebAPI
-      run: |
-        chmod +x $(pwd)/deploy/package-webapi.sh;
-        docker run --rm -v $(pwd):/app -w /app -e GITHUB_ACTIONS='true' mcr.microsoft.com/dotnet/sdk:${{ matrix.dotnet }} /bin/sh -c "/app/deploy/package-webapi.sh --no-zip";
-  
-    - name: Set version tag
-      id: versiontag
-      run: |
-        VERSION_TAG="$(date +'%Y%m%d').${{ github.run_number }}.${{ github.run_attempt }}"
-        echo $VERSION_TAG
-        echo "versiontag=$VERSION_TAG" >> $GITHUB_OUTPUT
-
-    - name: Upload package to artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: copilotchat-webapi-${{ steps.versiontag.outputs.versiontag }}
-        path: ./deploy/publish
+      - uses: actions/checkout@v3
+        with:
+          clean: true
+
+      - name: Pull container dotnet/sdk:${{ matrix.dotnet }}
+        run: docker pull mcr.microsoft.com/dotnet/sdk:${{ matrix.dotnet }}
+
+      - name: Package Copilot Chat WebAPI
+        run: |
+          chmod +x $(pwd)/scripts/deploy/package-webapi.sh;
+          docker run --rm -v $(pwd):/app -w /app -e GITHUB_ACTIONS='true' mcr.microsoft.com/dotnet/sdk:${{ matrix.dotnet }} /bin/sh -c "/app/scripts/deploy/package-webapi.sh --no-zip";
+
+      - name: Set version tag
+        id: versiontag
+        run: |
+          VERSION_TAG="$(date +'%Y%m%d').${{ github.run_number }}.${{ github.run_attempt }}"
+          echo $VERSION_TAG
+          echo "versiontag=$VERSION_TAG" >> $GITHUB_OUTPUT
+
+      - name: Upload package to artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: copilotchat-webapi-${{ steps.versiontag.outputs.versiontag }}
+          path: ./scripts/deploy/publish
diff --git a/.github/workflows/copilot-deploy-frontend.yml b/.github/workflows/copilot-deploy-frontend.yml
@@ -71,4 +71,4 @@ jobs:
 
       - name: Deploy SWA
         run: |
-          deploy/deploy-webapp.sh --subscription ${{secrets.AZURE_SUBSCRIPTION_ID}} --resource-group ${{vars.CC_DEPLOYMENT_GROUP_NAME}} --deployment-name ${{inputs.DEPLOYMENT_NAME}} --application-id ${{vars.APPLICATION_CLIENT_ID}} --authority ${{secrets.APPLICATION_AUTHORITY}} --no-redirect
+          scripts/deploy/deploy-webapp.sh --subscription ${{secrets.AZURE_SUBSCRIPTION_ID}} --resource-group ${{vars.CC_DEPLOYMENT_GROUP_NAME}} --deployment-name ${{inputs.DEPLOYMENT_NAME}} --application-id ${{vars.APPLICATION_CLIENT_ID}} --authority ${{secrets.APPLICATION_AUTHORITY}} --no-redirect
diff --git a/.github/workflows/copilot-deploy-infra.yml b/.github/workflows/copilot-deploy-infra.yml
@@ -61,4 +61,4 @@ jobs:
           inlineScript: |
             AI_SERVICE_KEY=$(az cognitiveservices account keys list --name ${{vars.AZUREOPENAI__NAME}} --resource-group ${{vars.AZUREOPENAI_DEPLOYMENT_GROUP_NAME}} | jq -r '.key1')
             echo "::add-mask::$AI_SERVICE_KEY"
-            deploy/deploy-azure.sh --subscription ${{secrets.AZURE_SUBSCRIPTION_ID}} --web-api-key ${{secrets.WEB_API_KEY}} --resource-group ${{vars.CC_DEPLOYMENT_GROUP_NAME}} --deployment-name ${{steps.deployment-id.outputs.deployment_name}} --region ${{vars.CC_DEPLOYMENT_REGION}} --ai-service AzureOpenAI --ai-endpoint ${{secrets.AZURE_OPENAI_ENDPOINT}} --ai-service-key $AI_SERVICE_KEY --app-service-sku ${{vars.WEBAPP_API_SKU}} --no-deploy-package --debug-deployment
+            scripts/deploy/deploy-azure.sh --subscription ${{secrets.AZURE_SUBSCRIPTION_ID}} --web-api-key ${{secrets.WEB_API_KEY}} --resource-group ${{vars.CC_DEPLOYMENT_GROUP_NAME}} --deployment-name ${{steps.deployment-id.outputs.deployment_name}} --region ${{vars.CC_DEPLOYMENT_REGION}} --ai-service AzureOpenAI --ai-endpoint ${{secrets.AZURE_OPENAI_ENDPOINT}} --ai-service-key $AI_SERVICE_KEY --app-service-sku ${{vars.WEBAPP_API_SKU}} --no-deploy-package --debug-deployment