Skip to content

Commit

Permalink
Merge branch 'preview' into renovate/serilog-3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
CalvinWilkinson authored Aug 17, 2023
2 parents f482e98 + 5198cf9 commit 9de1541
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 28 deletions.
21 changes: 0 additions & 21 deletions .github/workflows/add-new-issue-to-project.yml

This file was deleted.

38 changes: 38 additions & 0 deletions .github/workflows/add-new-item-to-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: 🤖Add New Issue To Project


defaults:
run:
shell: pwsh


on:
pull_request:
types: opened
branches: [main, preview, renovate/*]


jobs:
get_item_number:
name: Get Item Number
runs-on: ubuntu-latest
outputs:
item-number: ${{ steps.get-item-number.outputs.item-number }}
steps:
- name: Get Item Number
id: get-item-number
run: |
"item-number=${{ github.event.pull_request.number }}" >> $env:GITHUB_OUTPUT;
add_new_issue_to_project:
name: Add New Issue
needs: get_item_number
uses: KinsonDigital/Infrastructure/.github/workflows/add-item-to-project.yml@v12.0.0
with:
org-name: "${{ vars.ORGANIZATION_NAME }}"
org-project-name: "${{ vars.ORG_PROJECT_NAME }}"
repo-name: "${{ vars.PROJECT_NAME }}"
item-number: ${{ needs.get_item_number.outputs.item-number }}
secrets:
cicd-pat: ${{ secrets.CICD_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/build-status-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
jobs:
build_status_check:
name: ${{ vars.PROJECT_NAME }} Build Status Check
uses: KinsonDigital/Infrastructure/.github/workflows/build-csharp-project.yml@v10.0.2
uses: KinsonDigital/Infrastructure/.github/workflows/build-csharp-project.yml@v12.0.0
with:
project-name: "${{ vars.PROJECT_NAME }}"
build-config: Debug
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prepare-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
}
if ($releaseType -ne 'preview' -and $releaseType -ne 'roduction') {
if ($releaseType -ne 'preview' -and $releaseType -ne 'production') {
Write-Host "::error::The release type input must be either 'Preview' or 'Production'.";
exit 1;
}
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
prepare_release:
name: Prepare ${{ inputs.release-type }} Release Of ${{ vars.PROJECT_NAME }}
needs: print_validate_workflow
uses: KinsonDigital/Infrastructure/.github/workflows/prepare-release.yml@v10.0.2
uses: KinsonDigital/Infrastructure/.github/workflows/prepare-release.yml@v12.0.0
with:
project-name: "${{ vars.PROJECT_NAME }}"
release-type: "${{ inputs.release-type }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run_release:
name: Performing ${{ inputs.release-type }} Release of ${{ vars.PROJECT_NAME }} (${{ inputs.release-type == 'Production' && 'Release' || 'Debug' }})
needs: determine_release_notes_path
uses: KinsonDigital/Infrastructure/.github/workflows/dotnet-lib-release.yml@v10.0.2
uses: KinsonDigital/Infrastructure/.github/workflows/dotnet-lib-release.yml@v12.0.0
with:
project-name: "${{ vars.PROJECT_NAME}}"
release-type: "${{ inputs.release-type }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test-status-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
jobs:
run_tests:
name: ${{ vars.PROJECT_NAME }} Test Status Check
uses: KinsonDigital/Infrastructure/.github/workflows/run-csharp-tests.yml@v10.0.2
uses: KinsonDigital/Infrastructure/.github/workflows/run-csharp-tests.yml@v12.0.0
with:
project-name: "${{ vars.PROJECT_NAME }}Tests"
build-config: Debug
Expand Down
2 changes: 1 addition & 1 deletion Testing/VelaptorTests/VelaptorTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.msbuild" Version="3.2.0">
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion Velaptor.sln
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VelaptorTests", "Testing\Ve
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflows", "Workflows", "{CE2DE8AE-0037-4159-AE95-14D261BF9122}"
ProjectSection(SolutionItems) = preProject
.github\workflows\add-new-issue-to-project.yml = .github\workflows\add-new-issue-to-project.yml
.github\workflows\build-status-check.yml = .github\workflows\build-status-check.yml
.github\workflows\prepare-release.yml = .github\workflows\prepare-release.yml
.github\workflows\release.yml = .github\workflows\release.yml
Expand All @@ -39,6 +38,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflows", "Workflows", "{
.github\workflows\sync-status-check.yml = .github\workflows\sync-status-check.yml
.github\workflows\triage-issue.yml = .github\workflows\triage-issue.yml
.github\workflows\unit-test-status-check.yml = .github\workflows\unit-test-status-check.yml
.github\workflows\add-new-item-to-project.yml = .github\workflows\add-new-item-to-project.yml
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeasureTextPerf", "Performance\MeasureTextPerf\MeasureTextPerf.csproj", "{8690A40A-D3B2-488B-92B6-5771C21010E0}"
Expand Down

0 comments on commit 9de1541

Please sign in to comment.