fixup build.yml

ionide · Nov 14, 2024 · c792485 · c792485
1 parent 82e1444
commit c792485
Showing 1 changed file with 12 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,30 +11,27 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        dotnet-version: ["", "6.0.x", "7.0.x"]
+        dotnet-version: ["", "8.0.x", "9.0.x"]
         # these entries will mesh with the above combinations
         include:
           # just use what's in the repo
           - global-json-file: "global.json"
             dotnet-version: ""
-            include-prerelease: false
             label: "repo global.json"
             build_net9: false
-            globaljson-command: "dotnet new globaljson --sdk-version 6.0.400"
-          # latest 6.0 stable
+            globaljson-command: "dotnet new globaljson --sdk-version 8.0.400"
+          # latest 8.0 stable
           - global-json-file: "global.json"
-            dotnet-version: "6.0.x"
-            include-prerelease: false
-            label: "6.0 stable"
+            dotnet-version: "8.0.x"
+            label: "8.0 stable"
             build_net9: false
-            globaljson-command: "dotnet new globaljson --sdk-version 6.0.0 --roll-forward latestMinor"
-          # latest 7.0 preview
+            globaljson-command: "dotnet new globaljson --sdk-version 8.0.0 --roll-forward latestMinor"
+          # latest 9.0 stable
           - global-json-file: "global.json"
-            dotnet-version: "7.0.x"
-            include-prerelease: true
-            label: "7.0 preview"
+            dotnet-version: "9.0.x"
+            label: "9.0 stable"
             build_net9: true
-            globaljson-command: "dotnet new globaljson --sdk-version 7.0.0 --roll-forward latestMinor"
+            globaljson-command: "dotnet new globaljson --sdk-version 9.0.0 --roll-forward latestMinor"
       fail-fast: false # we have timing issues on some OS, so we want them all to run
     runs-on: ${{ matrix.os }}
     timeout-minutes: 15
@@ -46,13 +43,12 @@ jobs:
 
       # setup .NET per the repo global.json
       - name: Setup .NET
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v4
 
       # setup .NET per test session
       - name: Setup .NET
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v4
         with:
-          include-prerelease: ${{ matrix.include-prerelease }}
           global-json-file: ${{ matrix.global-json-file }}
           dotnet-version: ${{ matrix.dotnet-version }}