From 38a162e31646f5fe2517a0ceb2e7e4e563c4830c Mon Sep 17 00:00:00 2001 From: Landon Pierce Date: Wed, 26 Jan 2022 10:41:24 -0500 Subject: [PATCH] change template ref post merge --- .github/workflows/pr-deploy-saas-admin.yml | 2 +- .github/workflows/pr-deploy-saas-catalog.yml | 2 +- .github/workflows/pr-deploy-saas-provder.yml | 2 +- .github/workflows/pr-merge-saas-admin.yml | 4 +--- .github/workflows/pr-merge-saas-catalog.yml | 6 ++---- .github/workflows/pr-merge-saas-provider.yml | 2 +- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pr-deploy-saas-admin.yml b/.github/workflows/pr-deploy-saas-admin.yml index 173a4110..2aa081db 100644 --- a/.github/workflows/pr-deploy-saas-admin.yml +++ b/.github/workflows/pr-deploy-saas-admin.yml @@ -14,7 +14,7 @@ name: Saas.Admin PR Build jobs: build-and-deploy: # Utilizes re-usable template to build and deploy to app service slot - uses: Azure/azure-saas/.github/workflows/template-pr-deploy.yml@users/landonpierce/devenv + uses: Azure/azure-saas/.github/workflows/template-pr-deploy.yml@main with: dotnet_version: '6.0.x' artifact_name: ${{github.run_id}} diff --git a/.github/workflows/pr-deploy-saas-catalog.yml b/.github/workflows/pr-deploy-saas-catalog.yml index d6b1f5f2..8fd6c350 100644 --- a/.github/workflows/pr-deploy-saas-catalog.yml +++ b/.github/workflows/pr-deploy-saas-catalog.yml @@ -14,7 +14,7 @@ name: Saas.Catalog.API PR Build jobs: build-and-deploy: # Utilizes re-usable template to build and deploy to app service slot - uses: Azure/azure-saas/.github/workflows/template-pr-deploy.yml@users/landonpierce/devenv + uses: Azure/azure-saas/.github/workflows/template-pr-deploy.yml@main with: dotnet_version: '5.0.x' artifact_name: ${{ github.run_id }} diff --git a/.github/workflows/pr-deploy-saas-provder.yml b/.github/workflows/pr-deploy-saas-provder.yml index 8d235349..b7fff113 100644 --- a/.github/workflows/pr-deploy-saas-provder.yml +++ b/.github/workflows/pr-deploy-saas-provder.yml @@ -13,7 +13,7 @@ name: Saas.Provider.Web PR Build jobs: build-and-deploy: # Utilizes re-usable template to build and deploy to app service slot - uses: Azure/azure-saas/.github/workflows/template-pr-deploy.yml@users/landonpierce/devenv + uses: Azure/azure-saas/.github/workflows/template-pr-deploy.yml@main with: dotnet_version: '5.0.x' artifact_name: ${{ github.run_id }} diff --git a/.github/workflows/pr-merge-saas-admin.yml b/.github/workflows/pr-merge-saas-admin.yml index 6e3b49f8..1fd79ff6 100644 --- a/.github/workflows/pr-merge-saas-admin.yml +++ b/.github/workflows/pr-merge-saas-admin.yml @@ -8,13 +8,11 @@ on: - "src/Saas.Admin/**" - ".github/**" - name: Saas.Admin.Web Swap Slot - jobs: build-and-deploy: # Utilizes re-usable template to build and deploy to app service slot - uses: Azure/azure-saas/.github/workflows/template-pr-deploy.yml@users/landonpierce/devenv + uses: Azure/azure-saas/.github/workflows/template-pr-merge.yml@main with: app_service_name: app-asdk-admin-dev-001 app_service_resource_group_name: azure-saas-dev diff --git a/.github/workflows/pr-merge-saas-catalog.yml b/.github/workflows/pr-merge-saas-catalog.yml index 22eb8fb3..4a603024 100644 --- a/.github/workflows/pr-merge-saas-catalog.yml +++ b/.github/workflows/pr-merge-saas-catalog.yml @@ -9,13 +9,11 @@ on: - "src/Saas.Onboarding/**" - ".github/**" - -name: Saas.Admin.Web Swap Slot - +name: Saas.Catalog.Api Swap Slot jobs: build-and-deploy: # Utilizes re-usable template to build and deploy to app service slot - uses: Azure/azure-saas/.github/workflows/template-pr-deploy.yml@users/landonpierce/devenv + uses: Azure/azure-saas/.github/workflows/template-pr-merge.yml@main with: app_service_name: app-asdk-admin-dev-001 app_service_resource_group_name: azure-saas-dev diff --git a/.github/workflows/pr-merge-saas-provider.yml b/.github/workflows/pr-merge-saas-provider.yml index f193d1bf..d979cccd 100644 --- a/.github/workflows/pr-merge-saas-provider.yml +++ b/.github/workflows/pr-merge-saas-provider.yml @@ -12,7 +12,7 @@ name: Saas.Provider.Web Swap Slot jobs: build-and-deploy: # Utilizes re-usable template to build and deploy to app service slot - uses: Azure/azure-saas/.github/workflows/template-pr-merge.yml@users/landonpierce/devenv + uses: Azure/azure-saas/.github/workflows/template-pr-merge.yml@main with: app_service_name: app-asdk-dev-001 app_service_resource_group_name: azure-saas-dev