From adc21cbb1c21186206e45589f1f7140a0aa72317 Mon Sep 17 00:00:00 2001
From: Ziya Suzen <ziya@synadia.com>
Date: Thu, 31 Aug 2023 22:23:43 +0100
Subject: [PATCH] Release 2.0.0-alpha.2 (#123)

* Release 2.0.0-alpha.2

Changed docs workflow trigger

* Include dotnet 6.0 SDK

* Re-release alpha.1

* move tag to end

Signed-off-by: Caleb Lloyd <caleb@synadia.com>

---------

Signed-off-by: Caleb Lloyd <caleb@synadia.com>
Co-authored-by: Caleb Lloyd <caleb@synadia.com>
---
 .github/workflows/docs.yml    | 46 -----------------------------------
 .github/workflows/release.yml | 23 +++++++++++++++++-
 2 files changed, 22 insertions(+), 47 deletions(-)
 delete mode 100644 .github/workflows/docs.yml

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
deleted file mode 100644
index 4f878c055..000000000
--- a/.github/workflows/docs.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: Docs
-
-on:
-  push:
-    tags:
-    - v[0-9]+.[0-9]+.[0-9]+
-    - v[0-9]+.[0-9]+.[0-9]+-*
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
-# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
-
-jobs:
-
-  github_pages:
-
-    name: docfx
-    runs-on: ubuntu-latest
-
-    steps:
-
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup dotnet
-        uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: '7.x'
-
-      - run: dotnet tool update -g docfx
-      - run: docfx docs/docfx.json
-
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
-        with:
-          path: docs/_site
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fae61088e..3fc6e37bd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,6 +7,8 @@ on:
 
 permissions:
   contents: write
+  pages: write
+  id-token: write
 
 jobs:
   nuget:
@@ -34,7 +36,9 @@ jobs:
         name: Setup dotnet
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '6.x'
+          dotnet-version: |
+            6.x
+            7.x
 
       - if: ${{ fromJSON(steps.tag.outputs.create) }}
         name: Pack
@@ -44,6 +48,23 @@ jobs:
         name: Push
         run: dotnet nuget push dist/*.nupkg -s https://api.nuget.org/v3/index.json -k "${{ secrets.NUGET_API_KEY }}" --skip-duplicate
 
+      - if: ${{ fromJSON(steps.tag.outputs.create) }}
+        run: dotnet tool update -g docfx
+
+      - if: ${{ fromJSON(steps.tag.outputs.create) }}
+        run: docfx docs/docfx.json
+
+      - if: ${{ fromJSON(steps.tag.outputs.create) }}
+        name: Upload artifact
+        uses: actions/upload-pages-artifact@v1
+        with:
+          path: docs/_site
+
+      - if: ${{ fromJSON(steps.tag.outputs.create) }}
+        name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v2
+
       - if: ${{ fromJSON(steps.tag.outputs.create) }}
         name: Tag
         run: |