From e29e800d9dc2c7f494a29c667aefdda9c6d451a1 Mon Sep 17 00:00:00 2001 From: Nick Genovese Date: Fri, 6 Dec 2024 13:33:08 -0500 Subject: [PATCH] fix: now pushes the tag whenever not rc --- .github/workflows/docker.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 84996eaf4..f43a65867 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,7 +22,7 @@ env: jobs: Build_Project_4-Series: runs-on: windows-latest - steps: + steps: - uses: actions/checkout@v3 - name: Set Version Number id: setVersion @@ -57,28 +57,26 @@ jobs: $phase = 'beta' $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER } - } - echo "version=$newVersionString" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + } + + echo "version=$newVersionString" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append - name: Setup MS Build uses: microsoft/setup-msbuild@v1.1 - name: restore Nuget Packages run: nuget restore .\$($Env:SOLUTION_FILE).sln # Build the solutions in the docker image - - name: Build Solution + - 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') + if: ${{ !contains(steps.setVersion.outputs.version, 'rc') }} run: | git tag ${{ steps.setVersion.outputs.version }} git push --tags origin # Create the release on the source repo - name: Create Release id: create_release -# if: contains(steps.setVersion.outputs.version,'-rc-') || -# contains(steps.setVersion.outputs.version,'-hotfix-') || -# contains(steps.setVersion.outputs.version, '-beta-') uses: ncipollo/release-action@v1 with: artifacts: 'output\**\*.*(cpz|cplz)' @@ -86,11 +84,11 @@ jobs: prerelease: ${{contains('debug', env.BUILD_TYPE)}} tag: ${{ steps.setVersion.outputs.version }} - name: Setup Nuget - run: | + run: | nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username pepperdash -password ${{ secrets.GITHUB_TOKEN }} nuget setApiKey ${{ secrets.GITHUB_TOKEN }} -Source github - nuget setApiKey ${{ secrets.NUGET_API_KEY }} -Source https://api.nuget.org/v3/index.json + nuget setApiKey ${{ secrets.NUGET_API_KEY }} -Source https://api.nuget.org/v3/index.json - name: Publish to Nuget run: nuget push .\output\*.nupkg -Source https://api.nuget.org/v3/index.json - name: Publish to Github Nuget - run: nuget push .\output\*.nupkg -Source github \ No newline at end of file + run: nuget push .\output\*.nupkg -Source github