update ci

DCArea · Nov 30, 2023 · 2520982 · 2520982
1 parent 41fdbd2
commit 2520982
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 59 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -10,7 +10,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "7.0.400"
+          dotnet-version: "8.0.400"
       - name: Restore dependencies
         run: dotnet restore
       - name: Build
@@ -29,17 +29,10 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "6.0"
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: "7.0.400"
+          dotnet-version: "8.0.100"
       - name: Restore dependencies
         run: dotnet restore
       - name: Restore tools
         run: dotnet tool restore
       - name: Build
         run: dotnet build --configuration Release --no-restore --version-suffix="ci.${GITHUB_RUN_NUMBER}"
-      - name: Validate
-        run: Get-Item pkgs/*.nupkg |% { dotnet tool run dotnet-validate package local $_ }
-        shell: pwsh
diff --git a/.github/workflows/deploy_check.yaml b/.github/workflows/deploy_check.yaml
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -10,7 +10,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '7.0.400'
+        dotnet-version: '8.0.100'
         include-prerelease: true
     - name: Restore dependencies
       run: dotnet restore

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -12,20 +12,13 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "6.0"
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: "7.0.400"
+          dotnet-version: "8.0.100"
       - name: Restore dependencies
         run: dotnet restore
       - name: Restore tools
         run: dotnet tool restore
       - name: Build
         run: dotnet build --configuration Release --no-restore /p:version="${GITHUB_REF_NAME//v/}"
-      - name: Validate
-        run: Get-Item pkgs/*.nupkg |% { dotnet tool run dotnet-validate package local $_ }
-        shell: pwsh
       - name: NuGet Push
         run: Get-Item pkgs/*.nupkg |% { dotnet nuget push $_ --source ${{ secrets.NUGET_SOURCE }} --api-key ${{ secrets.NUGET_APIKEY }} }
         shell: pwsh
diff --git a/src/FabronService/Dockerfile b/src/FabronService/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0.100 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0.100 AS build
 WORKDIR /source
 
 # copy csproj and restore as distinct layers
@@ -23,7 +23,7 @@ WORKDIR /source/src/FabronService
 RUN dotnet publish -c release -o /app --no-restore
 
 # final stage/image
-FROM mcr.microsoft.com/dotnet/aspnet:7.0.1
+FROM mcr.microsoft.com/dotnet/aspnet:8.0.0
 WORKDIR /app
 ENV Logging__Console__FormatterName="ejson"
 COPY --from=build /app ./