Skip to content

Commit

Permalink
feat!: Update CICD to .Net 7, .Net 8
Browse files Browse the repository at this point in the history
  • Loading branch information
hermanho committed Mar 21, 2024
1 parent 0dc4219 commit d354dde
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
dotnet-version: ["3.1.x", "6.0.x"]
dotnet-version: ["7", "8"]
steps:
- uses: actions/checkout@v4
- name: Setup dotnet ${{ matrix.dotnet-version }}
Expand Down Expand Up @@ -58,8 +58,8 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
3.1.x
6.0.x
7
8
- name: Display dotnet version
run: dotnet --version
- uses: actions/cache@v3
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
dotnet-version: ["3.1.x", "6.0.x"]
dotnet-version: ["7","8"]
steps:
- uses: actions/checkout@v4
- name: Setup dotnet ${{ matrix.dotnet-version }}
Expand Down Expand Up @@ -64,8 +64,8 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
3.1.x
6.0.x
7
8
- name: Display dotnet version
run: dotnet --version
- uses: actions/cache@v3
Expand Down Expand Up @@ -94,11 +94,11 @@ jobs:
outputs:
release_created: ${{steps.release.outputs.release_created}}
steps:
- uses: google-github-actions/release-please-action@v3
- uses: google-github-actions/release-please-action@v4
id: release
with:
release-type: simple
command: manifest
config-file: release-please-config.json
manifest-file: .release-please-manifest.json

deploy:
runs-on: ubuntu-latest
Expand All @@ -110,8 +110,8 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
3.1.x
6.0.x
7
8
- name: Display dotnet version
run: dotnet --version
- uses: actions/cache@v3
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<VersionPrefix>3.1.0</VersionPrefix>
</PropertyGroup>
<PropertyGroup>
<TODAY>$([System.DateTime]::Now.ToString("yyyyMMdd-hhmmss"))</TODAY>
<TODAY>$([System.DateTime]::Now.ToString("yyyyMMdd"))</TODAY>
<InformationalVersion Condition=" '$(SHORT_SHA)' != '' ">$(InformationalVersion)git:$(SHORT_SHA)</InformationalVersion>
</PropertyGroup>
<Choose>
Expand All @@ -25,7 +25,7 @@
<!-- append the build number if it is available -->
<VersionSuffix Condition=" '$(GITHUB_RUN_NUMBER)' != '' ">$(VersionSuffix)$(GITHUB_RUN_NUMBER)</VersionSuffix>
<VersionSuffix Condition=" '$(SHORT_SHA)' != '' ">$(VersionSuffix)-$(SHORT_SHA)</VersionSuffix>
<VersionSuffix Condition=" '$(VersionSuffix)' == '' ">build$(TODAY)</VersionSuffix>
<VersionSuffix Condition=" '$(VersionSuffix)' == '' ">build-$(TODAY)</VersionSuffix>
</PropertyGroup>
</Otherwise>
</Choose>
Expand Down
2 changes: 1 addition & 1 deletion release-please-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
".": {
"package-name": "Postal.AspNetCore",
"release-type": "simple",
"prerelease": false,
"prerelease": true,
"include-component-in-tag": false,
"extra-files": [
{
Expand Down

0 comments on commit d354dde

Please sign in to comment.