From a5fcd718263f232479e06084c0244e55ffcc987a Mon Sep 17 00:00:00 2001 From: Vin Yu Date: Thu, 3 Sep 2020 13:27:41 -0700 Subject: [PATCH 01/12] Update Gemfile --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 2357416f..59713e90 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source "https://rubygems.org" -ruby "2.2.2" +ruby "2.6.2" gem "kramdown" gem "bundler" gem "jekyll", "3.5.2" @@ -13,4 +13,4 @@ gem "jekyll-feed" # bundle exec jekyll serve # # This will help ensure the proper Jekyll version is running. -# Happy Jekylling! \ No newline at end of file +# Happy Jekylling! From 9a37377fd1c80404ba3f0f8e5c7c9ba3c6e007d7 Mon Sep 17 00:00:00 2001 From: Azure Static Web Apps Date: Thu, 3 Sep 2020 21:19:04 -0700 Subject: [PATCH 02/12] ci: add Azure Static Web Apps workflow file on-behalf-of: @Azure opensource@microsoft.com --- ...tatic-web-apps-yellow-forest-0cd0b831e.yml | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml diff --git a/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml b/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml new file mode 100644 index 00000000..22fe6932 --- /dev/null +++ b/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml @@ -0,0 +1,45 @@ +name: Azure Static Web Apps CI/CD + +on: + push: + branches: + - vinandkatetest + pull_request: + types: [opened, synchronize, reopened, closed] + branches: + - vinandkatetest + +jobs: + build_and_deploy_job: + if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') + runs-on: ubuntu-latest + name: Build and Deploy Job + steps: + - uses: actions/checkout@v2 + with: + submodules: true + - name: Build And Deploy + id: builddeploy + uses: Azure/static-web-apps-deploy@v0.0.1-preview + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_YELLOW_FOREST_0CD0B831E }} + repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) + action: "upload" + ###### Repository/Build Configurations - These values can be configured to match you app requirements. ###### + # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig + app_location: "/" # App source code path + api_location: "api" # Api source code path - optional + app_artifact_location: "" # Built app content directory - optional + ###### End of Repository/Build Configurations ###### + + close_pull_request_job: + if: github.event_name == 'pull_request' && github.event.action == 'closed' + runs-on: ubuntu-latest + name: Close Pull Request Job + steps: + - name: Close Pull Request + id: closepullrequest + uses: Azure/static-web-apps-deploy@v0.0.1-preview + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_YELLOW_FOREST_0CD0B831E }} + action: "close" From dd1ab2bae71ed8b2502d6672df629674d5444dfa Mon Sep 17 00:00:00 2001 From: Vin Yu Date: Thu, 3 Sep 2020 21:28:04 -0700 Subject: [PATCH 03/12] Update azure-static-web-apps-yellow-forest-0cd0b831e.yml --- .../azure-static-web-apps-yellow-forest-0cd0b831e.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml b/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml index 22fe6932..998ef251 100644 --- a/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml +++ b/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml @@ -18,6 +18,14 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set up Ruby + uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0 + with: + ruby-version: 2.6 + - name: Install dependencies + run: bundle install + - name: Jekyll build + run: jekyll build - name: Build And Deploy id: builddeploy uses: Azure/static-web-apps-deploy@v0.0.1-preview From 0218bcc5a9267fc0547447142269580e9b17de72 Mon Sep 17 00:00:00 2001 From: Vin Yu Date: Thu, 3 Sep 2020 21:31:32 -0700 Subject: [PATCH 04/12] Update Gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 59713e90..ac6eb378 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source "https://rubygems.org" -ruby "2.6.2" +ruby "2.6.6" gem "kramdown" gem "bundler" gem "jekyll", "3.5.2" From e0a3c998c72aafce6560ae91d603dada4b23d1be Mon Sep 17 00:00:00 2001 From: Vin Yu Date: Thu, 3 Sep 2020 21:42:08 -0700 Subject: [PATCH 05/12] Update azure-static-web-apps-yellow-forest-0cd0b831e.yml --- .../workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml b/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml index 998ef251..b8ed4f1d 100644 --- a/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml +++ b/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml @@ -35,7 +35,7 @@ jobs: action: "upload" ###### Repository/Build Configurations - These values can be configured to match you app requirements. ###### # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig - app_location: "/" # App source code path + app_location: "/_layouts" # App source code path api_location: "api" # Api source code path - optional app_artifact_location: "" # Built app content directory - optional ###### End of Repository/Build Configurations ###### From b451fda9f8c3b0b5a9b167c50b0a6ea8b03cc3d1 Mon Sep 17 00:00:00 2001 From: Vin Yu Date: Thu, 3 Sep 2020 22:02:28 -0700 Subject: [PATCH 06/12] Update azure-static-web-apps-yellow-forest-0cd0b831e.yml --- .../workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml b/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml index b8ed4f1d..c9e5fc78 100644 --- a/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml +++ b/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml @@ -35,7 +35,7 @@ jobs: action: "upload" ###### Repository/Build Configurations - These values can be configured to match you app requirements. ###### # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig - app_location: "/_layouts" # App source code path + app_location: "/_includes/head.html" # App source code path api_location: "api" # Api source code path - optional app_artifact_location: "" # Built app content directory - optional ###### End of Repository/Build Configurations ###### From 1babdf169afe328f3db50ee1aa3bdd84b7a94dbd Mon Sep 17 00:00:00 2001 From: Vin Yu Date: Thu, 3 Sep 2020 22:57:03 -0700 Subject: [PATCH 07/12] Update azure-static-web-apps-yellow-forest-0cd0b831e.yml --- .../workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml b/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml index c9e5fc78..8b5b4c6c 100644 --- a/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml +++ b/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml @@ -35,7 +35,7 @@ jobs: action: "upload" ###### Repository/Build Configurations - These values can be configured to match you app requirements. ###### # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig - app_location: "/_includes/head.html" # App source code path + app_location: "/_includes" # App source code path api_location: "api" # Api source code path - optional app_artifact_location: "" # Built app content directory - optional ###### End of Repository/Build Configurations ###### From 35304ae713c70fc9d9d23249941db717b8a70b54 Mon Sep 17 00:00:00 2001 From: Vin Yu Date: Thu, 3 Sep 2020 23:05:33 -0700 Subject: [PATCH 08/12] Update azure-static-web-apps-yellow-forest-0cd0b831e.yml --- .../workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml b/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml index 8b5b4c6c..4637e8ee 100644 --- a/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml +++ b/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml @@ -35,7 +35,7 @@ jobs: action: "upload" ###### Repository/Build Configurations - These values can be configured to match you app requirements. ###### # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig - app_location: "/_includes" # App source code path + app_location: "/_site" # App source code path api_location: "api" # Api source code path - optional app_artifact_location: "" # Built app content directory - optional ###### End of Repository/Build Configurations ###### From dd3f2d90066bdb4cb42f9a52daf56636babbc235 Mon Sep 17 00:00:00 2001 From: Vin Yu Date: Thu, 3 Sep 2020 23:10:39 -0700 Subject: [PATCH 09/12] Update azure-static-web-apps-yellow-forest-0cd0b831e.yml --- .../workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml b/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml index 4637e8ee..fbe256aa 100644 --- a/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml +++ b/.github/workflows/azure-static-web-apps-yellow-forest-0cd0b831e.yml @@ -36,7 +36,6 @@ jobs: ###### Repository/Build Configurations - These values can be configured to match you app requirements. ###### # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig app_location: "/_site" # App source code path - api_location: "api" # Api source code path - optional app_artifact_location: "" # Built app content directory - optional ###### End of Repository/Build Configurations ###### From 3b6d3e412d6352733fbc70a9dd517c3c6bbda983 Mon Sep 17 00:00:00 2001 From: Vin Yu Date: Fri, 4 Sep 2020 00:05:52 -0700 Subject: [PATCH 10/12] Update _config.yml --- _config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/_config.yml b/_config.yml index 710f7047..2021c248 100644 --- a/_config.yml +++ b/_config.yml @@ -3,9 +3,7 @@ title: Build an app with Azure SQL or SQL Server description: > Get started with Azure SQL DB on the cloud or SQL Server on macOS, Linux, and Windows. -url: https://sqlchoice.azurewebsites.net -destination: ../wwwroot/en-us/sql-server/developer-get-started -baseurl: /en-us/sql-server/developer-get-started +destination: /_site disqus: shortname: sqlchoice From 66b564f970b26e8f12b0c406a9f353bd5b592847 Mon Sep 17 00:00:00 2001 From: Vin Yu Date: Fri, 4 Sep 2020 00:08:30 -0700 Subject: [PATCH 11/12] Update _config.yml --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 2021c248..69a3bbed 100644 --- a/_config.yml +++ b/_config.yml @@ -3,7 +3,7 @@ title: Build an app with Azure SQL or SQL Server description: > Get started with Azure SQL DB on the cloud or SQL Server on macOS, Linux, and Windows. -destination: /_site + disqus: shortname: sqlchoice From 619cd4da5b3383bca28a7092814a3858a05cbf9f Mon Sep 17 00:00:00 2001 From: akatesmith Date: Mon, 14 Sep 2020 09:38:17 -0700 Subject: [PATCH 12/12] Update setup_azure_sql_instance.md --- _includes/partials/setup_azure_sql_instance.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/partials/setup_azure_sql_instance.md b/_includes/partials/setup_azure_sql_instance.md index de39aa50..a18271c3 100644 --- a/_includes/partials/setup_azure_sql_instance.md +++ b/_includes/partials/setup_azure_sql_instance.md @@ -3,4 +3,4 @@ Go to this [**site**](https://docs.microsoft.com/en-us/azure/sql-database/sql-da 1. Perform the Prerequisites steps. -2. Follow steps 1-17 from the section: "Create a Single Database". \ No newline at end of file +2. Follow steps 1-17 from the section: **Create a Single Database**.