Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🔧Update build system #213

Merged
merged 1 commit into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,36 @@
"version": "5.12.0",
"commands": [
"dotnet-gitversion"
]
],
"rollForward": false
},
"thirdlicense": {
"version": "1.3.1",
"commands": [
"thirdlicense"
]
],
"rollForward": false
},
"dotnet-reportgenerator-globaltool": {
"version": "5.2.0",
"commands": [
"reportgenerator"
]
],
"rollForward": false
},
"docfx": {
"version": "2.73.2",
"version": "2.77.0",
"commands": [
"docfx"
]
],
"rollForward": false
},
"gitreleasemanager.tool": {
"version": "0.16.0",
"commands": [
"dotnet-gitreleasemanager"
]
],
"rollForward": false
}
}
}
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ dotnet_diagnostic.SA1025.severity = none # Allow spaces in comments to structure
dotnet_diagnostic.IDE0028.severity = suggestion # Simplify collection initialization
dotnet_diagnostic.IDE0045.severity = suggestion # Simplify ifs
dotnet_diagnostic.IDE0046.severity = suggestion # Simplify ifs
dotnet_diagnostic.IDE0057.severity = suggestion # Slice can be simplified

### StyleCop
dotnet_diagnostic.SA1101.severity = none # Do not force to prefix local calls with 'this'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: "Build"
uses: ./.github/workflows/build.yml
with:
dotnet_version: '8.0.303'
dotnet_version: '8.0.401'

# Preview release on push to main only
# Stable release on version tag push only
Expand All @@ -25,7 +25,7 @@ jobs:
needs: build
uses: ./.github/workflows/deploy.yml
with:
dotnet_version: '8.0.303'
dotnet_version: '8.0.401'
azure_nuget_feed: 'https://pkgs.dev.azure.com/SceneGate/SceneGate/_packaging/SceneGate-Preview/nuget/v3/index.json'
secrets:
nuget_preview_token: "az" # Dummy values as we use Azure DevOps only
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ jobs:
fetch-depth: 0 # We need full history for version number

- name: "Setup .NET SDK"
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ inputs.dotnet_version }}

- name: "Setup .NET 6.0 SDK"
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.424'

Expand All @@ -47,7 +47,7 @@ jobs:

- name: "Publish artifacts to CI"
if: ${{ matrix.is_main_build }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "Artifacts"
retention-days: 7
Expand All @@ -57,6 +57,6 @@ jobs:

- name: Publish docs artifact to CI
if: ${{ matrix.is_main_build }}
uses: actions/upload-pages-artifact@v2
uses: actions/upload-pages-artifact@v3
with:
path: build/artifacts/docs
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4

push_artifacts:
name: "Artifacts"
Expand All @@ -44,13 +44,13 @@ jobs:
fetch-depth: 0 # We need full history for version number

- name: "Download artifacts"
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: "Artifacts"
path: "./build/artifacts/"

- name: "Setup .NET SDK"
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ inputs.dotnet_version }}

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ build/temp/
*.userprefs
*.user
*.vs
*.DotSettings.user
launchSettings.json

# Benchmarks
BenchmarkDotNet.Artifacts/
2 changes: 1 addition & 1 deletion build/orchestrator/BuildSystem.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Frosting.PleOps.Recipe" Version="1.0.2" />
<PackageReference Include="Cake.Frosting.PleOps.Recipe" Version="1.0.3" />
</ItemGroup>

</Project>