Merge branch 'octokit:main' into dotnet

octokit · Nov 8, 2024 · 183ff1e · 183ff1e
2 parents 1554f52 + 0029dde
commit 183ff1e
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 130 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,103 @@
+name: Octokit.GraphQL CI
+
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - 'docs/**'
+      - '*.md'
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '*.md'
+  workflow_dispatch:
+
+env:
+  CONFIGURATION:                          'Release'
+  ARTIFACTS_STAGING_DIR_PATH:             '${{ github.workspace }}/nupkg'
+  OG_SOLUTION_PATH:                       '${{ github.workspace }}/Octokit.GraphQL.sln'
+  OG_UNIT_TESTS_PROJ_PATH:                '${{ github.workspace }}/src/Octokit.GraphQL.UnitTests/Octokit.GraphQL.UnitTests.csproj'
+  OG_CORE_UNIT_TESTS_PROJ_PATH:           '${{ github.workspace }}/src/Octokit.GraphQL.Core.UnitTests/Octokit.GraphQL.Core.UnitTests.csproj'
+  OG_CORE_GENERATOR_UNIT_TESTS_PROJ_PATH: '${{ github.workspace }}/src/Octokit.GraphQL.Core.Generation.UnitTests/Octokit.GraphQL.Core.Generation.UnitTests.csproj'
+  OG_INTEGRATION_TESTS_PROJ_PATH:         '${{ github.workspace }}/src/Octokit.GraphQL.IntegrationTests/Octokit.GraphQL.IntegrationTests.csproj'
+  OG_PACK_PROJ_PATH:                      '${{ github.workspace }}/src/Octokit.GraphQL.Pack/Octokit.GraphQL.Pack.csproj'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 3.1.101
+      - name: Setup NuGet
+        uses: nuget/setup-nuget@v2
+
+      - name: Build the solution
+        run: dotnet build ${{ env.OG_SOLUTION_PATH }} -c ${{ env.CONFIGURATION }}
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 3.1.101
+      - name: Setup NuGet
+        uses: nuget/setup-nuget@v2
+
+      - name: Run Octokit.GraphQL.UnitTests
+        run: 'dotnet test -c ${{ env.CONFIGURATION }} --no-build "${{ env.OG_UNIT_TESTS_PROJ_PATH }}"'
+
+      - name: Run Octokit.GraphQL.Core.UnitTests
+        run: 'dotnet test -c ${{ env.CONFIGURATION }} --no-build "${{ env.OG_CORE_UNIT_TESTS_PROJ_PATH }}"'
+
+      - name: Run Octokit.GraphQL.Core.Generation.UnitTests
+        run: 'dotnet test -c ${{ env.CONFIGURATION }} --no-build "${{ env.OG_CORE_GENERATOR_UNIT_TESTS_PROJ_PATH }}"'
+
+      - name: Run Octokit.GraphQL.IntegrationTests
+        run: 'dotnet test -c ${{ env.CONFIGURATION }} --no-build -p:CollectCoverage=true -p:CoverletOutputFormat=opencover -p:Exclude="[Octokit.GraphQL]Octokit.GraphQL.*" "${{ env.OG_INTEGRATION_TESTS_PROJ_PATH }}"'
+        env:
+          OCTOKIT_GQL_OAUTHTOKEN: ${{ secrets.OCTOKIT_GQL_OAUTHTOKEN }}
+          OCTOKIT_GQL_GITHUBUSERNAME: ${{ secrets.OCTOKIT_GQL_GITHUBUSERNAME }}
+
+  pack:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+      - name: Setup .NET & GitHub Packages
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 3.1.101
+          source-url: https://nuget.pkg.github.com/octokit/index.json
+        env:
+          NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build the solution
+        run: 'dotnet build ${{ env.OG_SOLUTION_PATH }} -c "${{ env.CONFIGURATION }}"'
+
+      - name: Create the new package
+        run: 'dotnet pack ${{ env.OG_PACK_PROJ_PATH }} -o "${{ env.ARTIFACTS_STAGING_DIR_PATH }}"'
+
+      - name: Publish to GitHub Actions
+        uses: actions/upload-artifact@v4
+        with:
+          name: nupkg
+          path: '${{ env.ARTIFACTS_STAGING_DIR_PATH }}/*.nupkg'
+
+      - name: Publish to GitHub Packages
+        if: github.ref == 'refs/heads/main'
+        run: 'dotnet nuget push "${{ env.ARTIFACTS_STAGING_DIR_PATH }}/*.nupkg"'
+
+      - name: Publish to nuget.org
+        if: github.ref == 'refs/heads/main'
+        run: 'dotnet nuget push "${{ env.ARTIFACTS_STAGING_DIR_PATH }}/*.nupkg" -s nuget.org -k ${{ secrets.NUGET_TOKEN }}'
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
diff --git a/.github/workflows/generate-schema.yml b/.github/workflows/generate-schema.yml
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
diff --git a/Octokit.GraphQL.sln b/Octokit.GraphQL.sln
@@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{516AB6AE
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{369BC54B-D0C7-4F5B-BBAA-D84732192187}"
 	ProjectSection(SolutionItems) = preProject
-		Scripts\configure-integration-tests.ps1 = Scripts\configure-integration-tests.ps1
+		Scripts\configure-integration-tests.ps1 = scripts\configure-integration-tests.ps1
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F50E915E-5C1C-4170-95B7-EA4E67D42423}"

diff --git a/readme.md b/readme.md
@@ -2,7 +2,7 @@
 
 <p align="center">
   <a style="text-decoration:none" href="https://github.com/octokit/octokit.graphql.net/actions/workflows/dotnetcore.yml">
-    <img src="https://github.com/octokit/octokit.graphql.net/actions/workflows/dotnetcore.yml/badge.svg" alt="CI Status" /></a>
+    <img src="https://github.com/octokit/octokit.graphql.net/actions/workflows/ci.yml/badge.svg" alt="CI Status" /></a>
   <a style="text-decoration:none" href="https://codecov.io/gh/octokit/octokit.graphql.net">
     <img src="https://codecov.io/gh/octokit/octokit.graphql.net/branch/main/graph/badge.svg" alt="CodeCov Status" /></a>
   <a style="text-decoration:none" href="https://www.nuget.org/packages/Octokit.GraphQL">