From 4f4d7a351f894104306b78d94c5e9d20601001d9 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Mon, 6 Feb 2023 17:36:42 -0700 Subject: [PATCH] ci: update workflows to upload clz to release --- .github/workflows/docker.yml | 36 +++++------ .github/workflows/main.yml | 115 +++++++++-------------------------- 2 files changed, 46 insertions(+), 105 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index af0d3d1..96c7fd2 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -11,8 +11,8 @@ on: env: # solution path doesn't need slashes unless there it is multiple folders deep # solution name does not include extension. .sln is assumed - SOLUTION_PATH: Pepperdash Core - SOLUTION_FILE: PepperDash Core 4-series + SOLUTION_PATH: . + SOLUTION_FILE: PepperDash Core # Do not edit this, we're just creating it here VERSION: 0.0.0-buildtype-buildnumber # Defaults to debug for build type @@ -57,33 +57,29 @@ jobs: uses: microsoft/setup-msbuild@v1.1 - name: restore Nuget Packages run: nuget restore ./$($Env:SOLUTION_PATH)/$($Env:SOLUTION_FILE) - env: - SOLUTION_FILE: PepperDash Core 4-Series.sln # Build the solutions in the docker image - name: Build Solution run: msbuild .\$($Env:SOLUTION_PATH)\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Debug" /p:Version="${{ steps.setVersion.outputs.version }}" - name: Create tag for non-rc builds - if: contains(steps.setVersion.outputs.version, 'alpha') || contains(steps.setVersion.outputs.version, 'beta') + if: contains(steps.setVersion.outputs.version, 'alpha') 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-') - uses: actions/create-release@v1 + 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: - tag_name: ${{ steps.setVersion.outputs.version }} - release_name: ${{ steps.setVersion.outputs.version }} + artifacts: **\*.clz + generateReleaseNotes: true prerelease: ${{contains('debug', env.BUILD_TYPE)}} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # Upload the build package to the release - - name: Add Github Packages source - run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }} - - name: Add nuget.org API Key - run: nuget setApiKey ${{ secrets.NUGET_API_KEY }} - - name: Publish nuget package to Github registry - run: nuget push ".\package\PepperDashCore.${{ steps.setVersion.outputs.version }}.nupkg" -Source github - - name: Publish nuget package to nuget.org - run: nuget push ".\package\PepperDashCore.${{ steps.setVersion.outputs.version }}.nupkg" -Source https://api.nuget.org/v3/index.json \ No newline at end of file + tag: ${{ steps.setVersion.outputs.version }} + - name: Publish to Nuget + run: | + nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }} + nuget setApiKey ${{ secrets.NUGET_API_KEY }} + nuget push ".\package\PepperDashCore.${{ steps.setVersion.outputs.version }}.nupkg" -Source github + nuget push ".\package\PepperDashCore.${{ steps.setVersion.outputs.version }}.nupkg" -Source https://api.nuget.org/v3/index.json \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ebeb23..e072d38 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,11 +5,11 @@ on: types: - created branches: - - main + - main-2 env: # solution path doesn't need slashes unless there it is multiple folders deep # solution name does not include extension. .sln is assumed - SOLUTION_PATH: Pepperdash Core + SOLUTION_PATH: . SOLUTION_FILE: Pepperdash Core # Do not edit this, we're just creating it here VERSION: 0.0.0-buildtype-buildnumber @@ -23,98 +23,43 @@ jobs: steps: # First we checkout the source repo - name: Checkout repo - uses: actions/checkout@v2 - with: - fetch-depth: 0 + uses: actions/checkout@v3 # Generate the appropriate version number - name: Set Version Number shell: powershell env: TAG_NAME: ${{ github.event.release.tag_name }} - run: echo "VERSION=$($Env:TAG_NAME)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - # Use the version number to set the version of the assemblies - - name: Update AssemblyInfo.cs - shell: powershell - run: | - Write-Output ${{ env.VERSION }} - ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }} + run: echo "VERSION=$($Env:TAG_NAME)" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append - name: Setup MS-Build uses: microsoft/setup-msbuild@v1 - name: restore Nuget Packages - run: nuget restore ./4-series/$($Env:SOLUTION_FILE).sln - # Build the solutions in the docker image - - name: Build Solution - shell: powershell - run: | - msbuild "./$($Env:SOLUTION_PATH)/$($Env:SOLUTION_FILE) 4-Series.sln" /p:platform="Any CPU" /p:configuration="Release" - # Zip up the output files as needed - - name: Zip Build Output - shell: powershell - run: | - $destination = "$($Env:GITHUB_HOME)\output" - New-Item -ItemType Directory -Force -Path ($destination) - Get-ChildItem ($destination) - $exclusions = @("packages", "3-series") - # Trying to get any .json schema files (not currently working) - # Gets any files with the listed extensions. - Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.nuspec" | ForEach-Object { - $allowed = $true; - # Exclude any files in submodules - foreach ($exclude in $exclusions) { - if ((Split-Path $_.FullName -Parent).contains("$($exclude)")) { - $allowed = $false; - break; - } - } - if ($allowed) { - Write-Host "allowing $($_)" - $_; - } - } | Copy-Item -Destination ($destination) -Force - Write-Host "Getting matching files..." - # Get any files from the output folder that match the following extensions - Get-ChildItem -Path $destination | Where-Object {($_.Extension -eq ".clz") -or ($_.Extension -eq ".cpz" -or ($_.Extension -eq ".cplz"))} | ForEach-Object { - # Replace the extensions with dll and xml and create an array - $filenames = @($($_ -replace "cpz|clz|cplz", "dll"), $($_ -replace "cpz|clz|cplz", "xml")) - Write-Host "Filenames:" - Write-Host $filenames - if ($filenames.length -gt 0) { - # Attempt to get the files and return them to the output directory - Get-ChildItem -Recurse -Path "$($Env:GITHUB_WORKSPACE)" -include $filenames | Copy-Item -Destination ($destination) -Force - } - } - Get-ChildItem -Path $destination\*.cplz | Rename-Item -NewName { "$($_.BaseName)-4s-$($Env:VERSION)$($_.Extension)" } - Compress-Archive -Path $destination -DestinationPath "$($Env:GITHUB_WORKSPACE)\$($Env:SOLUTION_FILE)-4s-$($Env:VERSION).zip" -Force - Write-Host "Output Contents post Zip" - Get-ChildItem -Path $destination - # Write the version to a file to be consumed by the push jobs - - name: Write Version - run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt" - - name: Upload Build Output - uses: actions/upload-artifact@v1 + run: nuget restore .\$($Env:SOLUTION_PATH)\$($Env:SOLUTION_FILE) + - name: Build Solution + run: msbuild .\$($Env:SOLUTION_PATH)\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Release" /p:Version="${{ steps.setVersion.outputs.version }}" + - name: Update Existing Release + id: create_release + uses: ncipollo/release-action@v1 with: - name: ${{ env.SOLUTION_FILE}}-4s-${{ env.VERSION}}.zip - path: ./${{ env.SOLUTION_FILE}}-4s-${{ env.VERSION}}.zip + artifacts: **\*.clz + generateReleaseNotes: false + prerelease: false + tag: ${{ github.event.release.tag_name }} # Upload the build package to the release - - name: Upload Release Package - id: upload_release - uses: actions/upload-release-asset@v1 - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./${{ env.SOLUTION_FILE}}-4s-${{ env.VERSION}}.zip - asset_name: ${{ env.SOLUTION_FILE}}-4s-${{ env.VERSION}}.zip - asset_content_type: application/zip - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# - name: Upload Release Package +# id: upload_release +# uses: actions/upload-release-asset@v1 +# with: +# upload_url: ${{ github.event.release.upload_url }} +# asset_path: ./${{ env.SOLUTION_FILE}}-4s-${{ env.VERSION}}.zip +# asset_name: ${{ env.SOLUTION_FILE}}-4s-${{ env.VERSION}}.zip +# asset_content_type: application/zip +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Add nuget.exe uses: nuget/setup-nuget@v1 - - name: Add Github Packages source - run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }} - - name: Add nuget.org API Key - run: nuget setApiKey ${{ secrets.NUGET_API_KEY }} - - name: Create nuget package - run: nuget pack "./Pepperdash Core/Pepperdash Core/PepperDash_Core_4-Series.csproj.nuspec" -version ${{ env.VERSION }} - - name: Publish nuget package to Github registry - run: nuget push "./*.nupkg" -Source github - - name: Publish nuget package to nuget.org - run: nuget push "./*.nupkg" -Source https://api.nuget.org/v3/index.json + - name: Publish to Nuget + run: | + nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }} + nuget setApiKey ${{ secrets.NUGET_API_KEY }} + nuget push ".\package\PepperDashCore.${{ steps.setVersion.outputs.version }}.nupkg" -Source github + nuget push ".\package\PepperDashCore.${{ steps.setVersion.outputs.version }}.nupkg" -Source https://api.nuget.org/v3/index.json