Skip to content

Commit

Permalink
Updates builds for 8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
i8beef committed Feb 24, 2024
1 parent 11aa19b commit d7de3c6
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ on:
- "**"

env:
DOTNETVERSION: "7.0.x"
DOTNETVERSION: "8.0.x"
APP: "HomeAutio.Mqtt.Ecobee"
SOLUTION: "./src/HomeAutio.Mqtt.Ecobee.sln"
BUILDOUTPUTPATH: "./src/HomeAutio.Mqtt.Ecobee/bin/Release/net7.0"
BUILDOUTPUTPATH: "./src/HomeAutio.Mqtt.Ecobee/bin/Release/net8.0"

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup .NET Core SDK ${{ env.DOTNETVERSION }}
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNETVERSION }}

Expand All @@ -32,7 +32,7 @@ jobs:
run: dotnet build ${{ env.SOLUTION }} --configuration Release --no-restore

- name: Upload app build artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.APP }}
path: ${{ env.BUILDOUTPUTPATH }}
Expand All @@ -41,7 +41,7 @@ jobs:
run: dotnet test ${{ env.SOLUTION }} --no-restore --verbosity normal --logger trx --results-directory "TestResults"

- name: Upload TestResults build artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: TestResults
path: TestResults
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ on:
- "v[0-9]+.[0-9]+.[0-9]+.[0-9]+"

env:
DOTNETVERSION: "7.0.x"
DOTNETVERSION: "8.0.x"
APP: "HomeAutio.Mqtt.Ecobee"
SOLUTION: "./src/HomeAutio.Mqtt.Ecobee.sln"
BUILDOUTPUTPATH: "./src/HomeAutio.Mqtt.Ecobee/bin/Release/net7.0"
BUILDOUTPUTPATH: "./src/HomeAutio.Mqtt.Ecobee/bin/Release/net8.0"
REGISTRY: ghcr.io
DOCKER_NAME: "i8beef/homeautio.mqtt.ecobee"

Expand All @@ -17,13 +17,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: master
fetch-depth: 0

- name: Setup .NET Core SDK ${{ env.DOTNETVERSION }}
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNETVERSION }}

Expand All @@ -48,13 +48,13 @@ jobs:
run: dotnet test ${{ env.SOLUTION }} --no-restore --verbosity normal --logger trx --results-directory "TestResults"

- name: Upload app build artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.APP }}-${{ steps.version.outputs.version-without-v }}
path: ${{ env.BUILDOUTPUTPATH }}

- name: Upload TestResults build artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: TestResults
path: TestResults
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: master
fetch-depth: 0
Expand Down
4 changes: 2 additions & 2 deletions src/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG VERSION=1.0.0.0
FROM mcr.microsoft.com/dotnet/sdk:5.0-alpine AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
ARG VERSION
WORKDIR /app

Expand All @@ -19,7 +19,7 @@ WORKDIR /app/HomeAutio.Mqtt.Ecobee
RUN dotnet publish -o out

# build runtime image
FROM mcr.microsoft.com/dotnet/runtime:5.0-alpine AS runtime
FROM mcr.microsoft.com/dotnet/runtime:8.0-alpine AS runtime
WORKDIR /app
COPY --from=publish /app/HomeAutio.Mqtt.Ecobee/out ./

Expand Down
4 changes: 2 additions & 2 deletions src/Dockerfile.arm32
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG VERSION=1.0.0.0
FROM mcr.microsoft.com/dotnet/sdk:5.0-alpine AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
ARG VERSION
WORKDIR /app

Expand All @@ -19,7 +19,7 @@ WORKDIR /app/HomeAutio.Mqtt.Ecobee
RUN dotnet publish -o out

# build runtime image
FROM mcr.microsoft.com/dotnet/runtime:5.0-alpine-arm32v7 AS runtime
FROM mcr.microsoft.com/dotnet/runtime:8.0-alpine-arm32v7 AS runtime
WORKDIR /app
COPY --from=publish /app/HomeAutio.Mqtt.Ecobee/out ./

Expand Down
4 changes: 2 additions & 2 deletions src/Dockerfile.arm64
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG VERSION=1.0.0.0
FROM mcr.microsoft.com/dotnet/sdk:5.0-alpine AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
ARG VERSION
WORKDIR /app

Expand All @@ -19,7 +19,7 @@ WORKDIR /app/HomeAutio.Mqtt.Ecobee
RUN dotnet publish -o out

# build runtime image
FROM mcr.microsoft.com/dotnet/runtime:5.0-alpine-arm64v8 AS runtime
FROM mcr.microsoft.com/dotnet/runtime:8.0-alpine-arm64v8 AS runtime
WORKDIR /app
COPY --from=publish /app/HomeAutio.Mqtt.Ecobee/out ./

Expand Down

0 comments on commit d7de3c6

Please sign in to comment.