Fix documentation workflow (#799)

Only publish documentation when we publish artifacts.

.github/workflows/ci.yaml

@@ -1,3 +1,4 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 name: Continuous Integration
 on: pull_request
 
@@ -23,7 +24,7 @@ jobs:
       with:
         dotnet-version: | 
           5.0.301
-          6.0.100
+          6.0.101
 
     - name: Setup Node.js
       uses: actions/setup-node@v2
@@ -81,9 +82,8 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: | 
-            3.1.402
             5.0.301
-            6.0.100
+            6.0.101
 
       - name: Integration Tests
         shell: bash

.github/workflows/docs.yaml

@@ -1,55 +0,0 @@
-name: Deploy Documentation
-on:
-    workflow_dispatch:
-    push:
-        paths:
-        - 'docs/**'
-        - 'src/**'
-        - 'test/**'
-        - 'examples/**'
-        - '.github/**'
-
-jobs:
-
-  ###################################################
-  # DOCS
-  ###################################################
-
-  build:
-    name: Deploy
-    runs-on: windows-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Setup .NET SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: | 
-          5.0.301
-          6.0.100
-
-    - name: Setup Node.js
-      uses: actions/setup-node@v2
-      with:
-        node-version: '16'
-
-    - name: Cache dependencies
-      uses: actions/cache@v2
-      with:
-        path: ~/.npm
-        key: npm-${{ hashFiles('package-lock.json') }}
-        restore-keys: npm-
-
-    - name: Publish
-      shell: bash
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        NETLIFY_ACCESS_TOKEN: ${{ secrets.NETLIFY_ACCESS_TOKEN }}
-        NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
-      run: |
-        cd docs
-        dotnet tool restore
-        dotnet run --configuration Release -- deploy

.github/workflows/publish.yaml

@@ -1,3 +1,4 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 name: Publish
 
 on:
@@ -13,40 +14,12 @@ env:
 
 jobs:
 
-  ###################################################
-  # DOCS
-  ###################################################
-
-  docs:
-    name: Documentation
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@master
-
-    - name: Setup .NET SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: | 
-          5.0.301
-          6.0.100
-
-    - name: Build
-      shell: bash
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        cd docs
-        dotnet tool restore
-        dotnet run --configuration Release
-
   ###################################################
   # BUILD
   ###################################################
 
   build:
     name: Build
-    needs: [docs]
     if: "!contains(github.event.head_commit.message, 'skip-ci') || startsWith(github.ref, 'refs/tags/')"
     strategy:
       matrix:
@@ -69,9 +42,8 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: | 
-            3.1.402
             5.0.301
-            6.0.100
+            6.0.101
 
       - name: Build
         shell: bash
@@ -79,6 +51,50 @@ jobs:
           dotnet tool restore
           dotnet cake
 
+  ###################################################
+  # DOCS
+  ###################################################
+
+  documentation:
+    name: Deploy
+    needs: [build]
+    runs-on: windows-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Setup .NET SDK
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: | 
+          5.0.301
+          6.0.100
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v2
+      with:
+        node-version: '16'
+
+    - name: Cache dependencies
+      uses: actions/cache@v2
+      with:
+        path: ~/.npm
+        key: npm-${{ hashFiles('package-lock.json') }}
+        restore-keys: npm-
+
+    - name: Publish Documentation
+      shell: bash
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        NETLIFY_ACCESS_TOKEN: ${{ secrets.NETLIFY_ACCESS_TOKEN }}
+        NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
+      run: |
+        cd docs
+        dotnet tool restore
+        dotnet run --configuration Release -- deploy
+
   ###################################################
   # PUBLISH
   ###################################################
@@ -98,9 +114,8 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: | 
-            3.1.402
             5.0.301
-            6.0.100
+            6.0.101
 
       - name: Publish
         shell: bash

docs/global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "2.2.200",
+    "version": "6.0.101",
-    "rollForward": "latestMajor"
+    "rollForward": "latestFeature"
   }
 }

global.json

@@ -1,7 +1,7 @@
 {
   "projects": [ "src", "tests" ],
   "sdk": {
-    "version": "6.0.100",
+    "version": "6.0.101",
     "rollForward": "latestFeature"
   }
 }