Merge master into benchmarks-documentation

.github/workflows/build-and-publish-alpha.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.x
+          dotnet-version: 6.0.x
       - name: Get previous tag.
         id: version
         run: |
@@ -28,21 +28,21 @@ jobs:
         with:
           result-encoding: string
           script: |
-                const incoming = "${{steps.version.outputs.tag}}"
-                console.log("Incoming Tag: " + incoming)
-                if(incoming.includes('alpha')) {
-                  const oldNum = incoming.match(/alpha[.]*(\d+)/)[1]
-                  const newNum = parseInt(oldNum)+1
-                  const newTag = incoming.replace(/alpha.*\d+/, `alpha.${newNum}`)
-                  console.log("New Tag: " + newTag)
-                  return newTag
-                }
-                else {
-                  const splitLast = incoming.match(/(.*\.)(\d*)/)
-                  const newTag =splitLast[1] + (parseInt(splitLast[2])+1)+'-alpha.0'
-                  console.log("New Tag: " + newTag)
-                  return newTag
-                }
+            const incoming = "${{steps.version.outputs.tag}}"
+            console.log("Incoming Tag: " + incoming)
+            if(incoming.includes('alpha')) {
+              const oldNum = incoming.match(/alpha[.]*(\d+)/)[1]
+              const newNum = parseInt(oldNum)+1
+              const newTag = incoming.replace(/alpha.*\d+/, `alpha.${newNum}`)
+              console.log("New Tag: " + newTag)
+              return newTag
+            }
+            else {
+              const splitLast = incoming.match(/(.*\.)(\d*)/)
+              const newTag =splitLast[1] + (parseInt(splitLast[2])+1)+'-alpha.0'
+              console.log("New Tag: " + newTag)
+              return newTag
+            }
       - name: Set NuGet version from alpha.
         run: echo "NUGET_VERSION=${{steps.bump-with-alpha.outputs.result}}" >> $GITHUB_ENV
       - name: Build Elements

.github/workflows/build-and-test-on-pr.yml

@@ -11,6 +11,6 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.x
+          dotnet-version: 6.0.x
       - run: dotnet build -c release
       - run: dotnet test -c release

.github/workflows/build-docs.yml

@@ -9,13 +9,19 @@ jobs:
     runs-on: windows-2019
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 10
+          token: ${{ secrets.HYPAR_GITHUB_BOT_PAT }}
+          ref: master
+      - name: Setup Git
+        run: |
+          git config user.name "hypar-eric-bot"
+          git config user.email "[email protected]"
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.x
+          dotnet-version: 6.0.x
       - name: Setup docfx
         run: choco install docfx -y
       - name: Build docs
@@ -24,11 +30,7 @@ jobs:
           dotnet test --filter Category=Examples
           docfx ./doc/docfx.json -f
       - name: Deploy Docs
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: us-west-1
-        run: |
-          aws s3 sync ./docs s3://${{ secrets.AWS_BUCKET }} --delete --exclude '*.js'
-          aws s3 sync ./docs s3://${{ secrets.AWS_BUCKET }} --delete --exclude '*' --include '*.js' --content-type 'text/javascript'
-          aws cloudfront create-invalidation --distribution-id E2PS0S8A6ZSOKE --paths "/*"
+        uses: EndBug/add-and-commit@v9
+        with:
+          add: "docs"
+          message: "Update documentation"

.github/workflows/publish-on-tag.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.x
+          dotnet-version: 6.0.x
       - name: Set env
         run: echo "NUGET_VERSION=$(echo ${GITHUB_REF:10})" >> $GITHUB_ENV
       - run: dotnet build -c release -p:Version=${{ env.NUGET_VERSION }}