Skip to content

Commit

Permalink
ci: set version for templates
Browse files Browse the repository at this point in the history
(cherry picked from commit f6e4832)

# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/publish-release.yml
  • Loading branch information
dansiegel authored and mergify[bot] committed Jul 22, 2024
1 parent a4b85d9 commit cbd71b2
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:

jobs:
build-prism-core:
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
with:
name: Build Prism.Core
solution-path: PrismLibrary_Core.slnf
2 changes: 1 addition & 1 deletion .github/workflows/build_forms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:

jobs:
build-prism-forms:
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@master
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@v1
with:
name: Build Prism.Forms
solution-path: PrismLibrary_Forms.slnf
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_maui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:

jobs:
build-prism-maui:
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
with:
name: Build Prism.Maui
solution-path: PrismLibrary_Maui.slnf
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_uno.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:

jobs:
build-prism-uno:
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@dev/update-netsdkinstaller
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@v1
with:
name: Build Prism.Uno
solution-path: PrismLibrary_Uno.slnf
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_wpf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:

jobs:
build-prism-wpf:
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
with:
name: Build Prism.Wpf
solution-path: PrismLibrary_Wpf.slnf
17 changes: 10 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:

jobs:
build-prism-core:
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
with:
name: Build Prism.Core
solution-path: PrismLibrary_Core.slnf
Expand All @@ -36,7 +36,7 @@ jobs:
codeSignCertificate: ${{ secrets.CodeSignCertificate }}

build-prism-wpf:
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
with:
name: Build Prism.Wpf
solution-path: PrismLibrary_Wpf.slnf
Expand All @@ -50,7 +50,7 @@ jobs:
codeSignCertificate: ${{ secrets.CodeSignCertificate }}

build-prism-forms:
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@master
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@v1
with:
name: Build Prism.Forms
solution-path: PrismLibrary_Forms.slnf
Expand All @@ -65,7 +65,7 @@ jobs:
codeSignCertificate: ${{ secrets.CodeSignCertificate }}

build-prism-uno:
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@master
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@v1
with:
name: Build Prism.Uno
solution-path: PrismLibrary_Uno.slnf
Expand All @@ -86,7 +86,7 @@ jobs:
codeSignCertificate: ${{ secrets.CodeSignCertificate }}

build-prism-maui:
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
with:
name: Build Prism.Maui
solution-path: PrismLibrary_Maui.slnf
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
path: .\artifacts\nuget

deploy-internal:
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@master
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@v1
needs: generate-consolidated-artifacts
if: ${{ github.event_name == 'push' }}
with:
Expand All @@ -158,13 +158,16 @@ jobs:
apiKey: ${{ secrets.IN_HOUSE_API_KEY }}

deploy-commercial-plus:
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@master
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@v1
needs: generate-consolidated-artifacts
if: ${{ github.event_name == 'push' }}
<<<<<<< HEAD
<<<<<<< HEAD
=======
# environment: NuGet
>>>>>>> ae7ff2b8 (ci: add release branches to build)
=======
>>>>>>> f6e48324 (ci: set version for templates)
with:
name: Deploy Commercial Plus
secrets:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,23 @@ on:

jobs:
publish-internal:
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@master
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@v1
secrets:
feedUrl: ${{ secrets.IN_HOUSE_NUGET_FEED }}
apiKey: ${{ secrets.IN_HOUSE_API_KEY }}

publish-commercial-plus:
<<<<<<< HEAD
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@master
=======
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@v1
>>>>>>> f6e48324 (ci: set version for templates)
secrets:
feedUrl: ${{ secrets.PRISM_NUGET_FEED }}
apiKey: ${{ secrets.PRISM_NUGET_TOKEN }}

publish-nuget:
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@master
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@v1
secrets:
apiKey: ${{ secrets.NUGET_API_KEY }}

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/start-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
build-prism-core:
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
with:
name: Build Prism.Core
solution-path: PrismLibrary_Core.slnf
Expand All @@ -20,7 +20,7 @@ jobs:
codeSignCertificate: ${{ secrets.CodeSignCertificate }}

build-prism-wpf:
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
with:
name: Build Prism.Wpf
solution-path: PrismLibrary_Wpf.slnf
Expand All @@ -35,7 +35,7 @@ jobs:
codeSignCertificate: ${{ secrets.CodeSignCertificate }}

build-prism-forms:
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@master
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@v1
with:
name: Build Prism.Forms
solution-path: PrismLibrary_Forms.slnf
Expand All @@ -51,7 +51,7 @@ jobs:
codeSignCertificate: ${{ secrets.CodeSignCertificate }}

build-prism-uno:
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@master
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@v1
with:
name: Build Prism.Uno
solution-path: PrismLibrary_Uno.slnf
Expand All @@ -70,7 +70,7 @@ jobs:
codeSignCertificate: ${{ secrets.CodeSignCertificate }}

build-prism-maui:
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
with:
name: Build Prism.Maui
solution-path: PrismLibrary_Maui.slnf
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
path: .\artifacts\nuget

release:
uses: avantipoint/workflow-templates/.github/workflows/generate-release.yml@master
uses: avantipoint/workflow-templates/.github/workflows/generate-release.yml@v1
needs: [generate-consolidated-artifacts]
permissions:
contents: write
Expand Down

0 comments on commit cbd71b2

Please sign in to comment.