From f614032c825ac054f955d9cd583565a906ec54e7 Mon Sep 17 00:00:00 2001 From: Patrik Svensson Date: Tue, 5 Apr 2022 08:40:30 +0200 Subject: [PATCH] Fix documentation workflow (#799) Only publish documentation when we publish artifacts. --- .github/workflows/ci.yaml | 6 +-- .github/workflows/docs.yaml | 55 ----------------------- .github/workflows/publish.yaml | 79 ++++++++++++++++++++-------------- docs/global.json | 6 +-- global.json | 2 +- 5 files changed, 54 insertions(+), 94 deletions(-) delete mode 100644 .github/workflows/docs.yaml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index da89655..0634fc6 100644 --- a/.github/workflows/ci.yaml +++ b/.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 diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml deleted file mode 100644 index fc9699b..0000000 --- a/.github/workflows/docs.yaml +++ /dev/null @@ -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 diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 53cc13b..6cb1470 100644 --- a/.github/workflows/publish.yaml +++ b/.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 diff --git a/docs/global.json b/docs/global.json index 7281fbf..6ecdd61 100644 --- a/docs/global.json +++ b/docs/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "2.2.200", - "rollForward": "latestMajor" + "version": "6.0.101", + "rollForward": "latestFeature" } -} \ No newline at end of file +} diff --git a/global.json b/global.json index 7f4138d..6a1b5ce 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "projects": [ "src", "tests" ], "sdk": { - "version": "6.0.100", + "version": "6.0.101", "rollForward": "latestFeature" } }