simplify setup dotnet (#1043)

kubernetes-client · Oct 3, 2022 · d9c5c73 · d9c5c73
1 parent 8888a16
commit d9c5c73
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 59 deletions.
diff --git a/.github/workflows/buildtest.yaml b/.github/workflows/buildtest.yaml
@@ -11,18 +11,13 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Setup dotnet SDK 3.1
+      - name: Setup dotnet
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: '3.1.x'          
-      - name: Setup dotnet SDK 5
-        uses: actions/setup-dotnet@v2
-        with:
-          dotnet-version: '5.0.x'          
-      - name: Setup dotnet SDK 6
-        uses: actions/setup-dotnet@v2
-        with:
-          dotnet-version: '6.0.x'          
+          dotnet-version: |
+           3.1.x
+           5.0.x
+           6.0.x             
       # - name: Check Format
       #   # don't check formatting on Windows b/c of CRLF issues.
       #   if: matrix.os == 'ubuntu-latest'
@@ -31,11 +26,6 @@ jobs:
         run: dotnet build --configuration Release -v detailed
       - name: Test
         run: dotnet test /p:CollectCoverage=true /p:ExcludeByFile=\"**/KubernetesClient/generated/**/*.cs\" /p:CoverletOutputFormat="cobertura"
-      # - uses: 5monkeys/cobertura-action@master
-      #   with:
-      #     path: tests/KubernetesClient.Tests/coverage.netcoreapp2.1.cobertura.xml
-      #     repo_token: ${{ secrets.GITHUB_TOKEN }}
-      #     minimum_coverage: 0
 
   # Test code gen for visual studio compatibility >> https://github.com/kubernetes-client/csharp/pull/1008
   codgen:
@@ -62,18 +52,13 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Setup dotnet SDK 3.1
-        uses: actions/setup-dotnet@v2
-        with:
-          dotnet-version: '3.1.x'          
-      - name: Setup dotnet SDK 5
-        uses: actions/setup-dotnet@v2
-        with:
-          dotnet-version: '5.0.x'                
-      - name: Setup dotnet SDK 6
+      - name: Setup dotnet
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: '6.0.x'          
+          dotnet-version: |
+           3.1.x
+           5.0.x
+           6.0.x        
       - name: Minikube
         run: minikube start
       - name: Test

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -25,18 +25,13 @@ jobs:
       with:
           fetch-depth: 0
 
-    - name: Setup dotnet SDK 3.1
+    - name: Setup dotnet
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: '3.1.x'          
-    - name: Setup dotnet SDK 5
-      uses: actions/setup-dotnet@v2
-      with:
-        dotnet-version: '5.0.x'                
-    - name: Setup dotnet SDK 6
-      uses: actions/setup-dotnet@v2
-      with:
-        dotnet-version: '6.0.x'               
+        dotnet-version: |
+          3.1.x
+          5.0.x
+          6.0.x                     
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

diff --git a/.github/workflows/draft.yaml b/.github/workflows/draft.yaml
@@ -14,20 +14,13 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: .NET Core 3.1.x SDK
+    - name: Setup dotnet
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 3.1.x
-
-    - name: .NET 5.x SDK
-      uses: actions/setup-dotnet@v2
-      with:
-        dotnet-version: 5.0.x
-
-    - name: .NET 6.x SDK
-      uses: actions/setup-dotnet@v2
-      with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+          3.1.x
+          5.0.x
+          6.0.x       
 
     - name: dotnet restore
       run: dotnet restore --verbosity minimal --configfile nuget.config

diff --git a/.github/workflows/nuget.yaml b/.github/workflows/nuget.yaml
@@ -14,20 +14,13 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: .NET Core 3.1.x SDK
+    - name: Setup dotnet
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 3.1.x
-
-    - name: .NET 5.x SDK
-      uses: actions/setup-dotnet@v2
-      with:
-        dotnet-version: 5.0.x
-
-    - name: .NET 6.x SDK
-      uses: actions/setup-dotnet@v2
-      with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+          3.1.x
+          5.0.x
+          6.0.x       
 
     - name: dotnet restore
       run: dotnet restore --verbosity minimal --configfile nuget.config