From 60dbaf547d3509e4bac00827119448483317a570 Mon Sep 17 00:00:00 2001 From: jtalborough Date: Fri, 2 Aug 2024 11:00:07 -0400 Subject: [PATCH 1/5] fix: artifact path --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7fe106d3..23b077a4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -79,7 +79,7 @@ jobs: # contains(steps.setVersion.outputs.version, '-beta-') uses: ncipollo/release-action@v1 with: - artifacts: 'output\**\*.*(cpz|cplz)' + artifacts: 'output\*.*(cpz|cplz)' generateReleaseNotes: true prerelease: ${{contains('debug', env.BUILD_TYPE)}} tag: ${{ steps.setVersion.outputs.version }} From 3f45372e1ef1472bf4629633fb95998386e72145 Mon Sep 17 00:00:00 2001 From: jtalborough Date: Fri, 2 Aug 2024 15:55:38 -0400 Subject: [PATCH 2/5] feature: add cpz test --- .../PepperDash.Essentials.csproj | 114 +++++++++--------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/src/PepperDash.Essentials/PepperDash.Essentials.csproj b/src/PepperDash.Essentials/PepperDash.Essentials.csproj index 274b257f..d64846e5 100644 --- a/src/PepperDash.Essentials/PepperDash.Essentials.csproj +++ b/src/PepperDash.Essentials/PepperDash.Essentials.csproj @@ -1,58 +1,58 @@ - - - Program - Debug;Release;Debug 4.7.2 - - - PepperDash.Essentials - PepperDashEssentials - net472;net6 - true - bin\$(Configuration)\ - PepperDash Essentials - PepperDashEssentials - 2.0.0-local - $(Version) - false - - - full - - - full - - - pdbonly - - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - - - - - - - - + + + Program + Debug;Release;Debug 4.7.2 + + + PepperDash.Essentials + PepperDashEssentials + net472;net6 + true + bin\$(Configuration)\ + PepperDash Essentials + PepperDashEssentials + 2.0.0-local + $(Version) + false + + + full + + + full + + + pdbonly + + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + + + + + + + + \ No newline at end of file From a96fb2189862b6d86de295120b0f1185c06a4b56 Mon Sep 17 00:00:00 2001 From: jtalborough Date: Mon, 5 Aug 2024 09:52:57 -0400 Subject: [PATCH 3/5] feature: add dotnet pack --- .github/workflows/docker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 23b077a4..4c7e7140 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -66,6 +66,8 @@ jobs: # Build the solutions in the docker image - name: Build Solution run: msbuild .\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Debug" /p:Version="${{ steps.setVersion.outputs.version }}" -m + - name: Pack Solution + run: dotnet pack .\$($Env:SOLUTION_FILE).sln --configuration $env:BUILD_TYPE --output ./output /p:Version="${{ steps.setVersion.outputs.version }}" - name: Create tag for non-rc builds if: contains(steps.setVersion.outputs.version, 'alpha') run: | From 2e31719a84412d6264183d988c86bdcc868c2b86 Mon Sep 17 00:00:00 2001 From: jtalborough Date: Mon, 5 Aug 2024 10:39:04 -0400 Subject: [PATCH 4/5] fix: artifact path --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4c7e7140..84996eaf 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -81,7 +81,7 @@ jobs: # contains(steps.setVersion.outputs.version, '-beta-') uses: ncipollo/release-action@v1 with: - artifacts: 'output\*.*(cpz|cplz)' + artifacts: 'output\**\*.*(cpz|cplz)' generateReleaseNotes: true prerelease: ${{contains('debug', env.BUILD_TYPE)}} tag: ${{ steps.setVersion.outputs.version }} From 778af651d0b7ea47ca46c1e43dbd0fd7eb94dc5f Mon Sep 17 00:00:00 2001 From: jtalborough Date: Mon, 5 Aug 2024 10:40:33 -0400 Subject: [PATCH 5/5] feature: adds pack for release builds --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index babd2651..a0a1f3ba 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,6 +37,8 @@ jobs: run: nuget restore .\$($Env:SOLUTION_FILE).sln - name: Build Solution run: msbuild .\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Debug" /p:Version="${{ steps.setVersion.outputs.version }}" -m + - name: Pack Solution + run: dotnet pack .\$($Env:SOLUTION_FILE).sln --configuration $env:BUILD_TYPE --output ./output /p:Version="${{ steps.setVersion.outputs.version }}" - name: Upload Release id: create_release uses: ncipollo/release-action@v1