From cbd71b227a9d5b6327bcfd14495e9845f7482c1e Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Sat, 20 Jul 2024 13:31:28 -0600 Subject: [PATCH] ci: set version for templates (cherry picked from commit f6e48324d1fd3fd07226fec9fa5d5e21347f78c1) # Conflicts: # .github/workflows/ci.yml # .github/workflows/publish-release.yml --- .github/workflows/build_core.yml | 2 +- .github/workflows/build_forms.yml | 2 +- .github/workflows/build_maui.yml | 2 +- .github/workflows/build_uno.yml | 2 +- .github/workflows/build_wpf.yml | 2 +- .github/workflows/ci.yml | 17 ++++++++++------- .github/workflows/publish-release.yml | 8 ++++++-- .github/workflows/start-release.yml | 12 ++++++------ 8 files changed, 27 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build_core.yml b/.github/workflows/build_core.yml index 7b2a3a22e3..6facbfa901 100644 --- a/.github/workflows/build_core.yml +++ b/.github/workflows/build_core.yml @@ -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 diff --git a/.github/workflows/build_forms.yml b/.github/workflows/build_forms.yml index dd325f37e0..764b062d57 100644 --- a/.github/workflows/build_forms.yml +++ b/.github/workflows/build_forms.yml @@ -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 diff --git a/.github/workflows/build_maui.yml b/.github/workflows/build_maui.yml index 3593548a70..80725015ac 100644 --- a/.github/workflows/build_maui.yml +++ b/.github/workflows/build_maui.yml @@ -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 diff --git a/.github/workflows/build_uno.yml b/.github/workflows/build_uno.yml index f7d17a49ff..8fd3baae04 100644 --- a/.github/workflows/build_uno.yml +++ b/.github/workflows/build_uno.yml @@ -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 diff --git a/.github/workflows/build_wpf.yml b/.github/workflows/build_wpf.yml index 1399ea5b64..6da41c003b 100644 --- a/.github/workflows/build_wpf.yml +++ b/.github/workflows/build_wpf.yml @@ -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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42325469c3..6f000564e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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: @@ -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: diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index f3f5393c0e..853a9edfad 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -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 }} diff --git a/.github/workflows/start-release.yml b/.github/workflows/start-release.yml index 28550d83b2..23fd0074e9 100644 --- a/.github/workflows/start-release.yml +++ b/.github/workflows/start-release.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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