From 867b68f6656659030facde82bae332506c41bb9a Mon Sep 17 00:00:00 2001 From: anthony Date: Sat, 19 Oct 2024 00:00:40 -0400 Subject: [PATCH] update workflow --- .../workflows/create-release-with-asset.yml | 30 ++++- .github/workflows/deploy-release-binaries.yml | 120 ------------------ 2 files changed, 25 insertions(+), 125 deletions(-) delete mode 100644 .github/workflows/deploy-release-binaries.yml diff --git a/.github/workflows/create-release-with-asset.yml b/.github/workflows/create-release-with-asset.yml index 362900c..eaffad1 100644 --- a/.github/workflows/create-release-with-asset.yml +++ b/.github/workflows/create-release-with-asset.yml @@ -20,16 +20,16 @@ jobs: create-release: runs-on: ubuntu-latest outputs: - release-asset-upload-url: ${{ steps.get-release-outputs.outputs.upload_url }} + release-asset-upload-url: ${{ steps.create-tag-release.outputs.upload_url }} steps: # create a tag and a release - name: Create Tag & Release id: create-tag-release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: rymndhng/release-on-push-action@master + uses: DasBen/release-on-push-action@master with: - bump_version_scheme: minor + bump_version_scheme: patch tag_prefix: v use_github_release_notes: true release_name: "Release " @@ -42,7 +42,6 @@ jobs: echo "Got tag name ${{ steps.create-tag-release.outputs.tag_name }}" echo "Got release version ${{ steps.create-tag-release.outputs.version }}" echo "Upload release artifacts to ${{ steps.create-tag-release.outputs.upload_url }}" - echo "upload_url=${{ steps.create-tag-release.outputs.upload_url }}" >> $GITHUB_OUTPUT prepare-upload-asset: runs-on: windows-latest @@ -115,6 +114,27 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: ${{ needs.create-release.outputs.release-asset-upload-url }} - asset_path: ${{ github.workspace }}/Build_Release.zip + asset_path: ${{ github.workspace }}\Build_Release.zip + asset_name: Build_Release.zip + asset_content_type: application/zip + + # send build output to github output + - name: Upload Build Artifact + id: upload-build-artifact-2 + uses: actions/upload-artifact@v4 + with: + name: build-executable-artifact-2 + path: ${{ github.workspace }}\Solution\TrangTestStub\bin\Release\* + retention-days: 5 + + # upload build output to release + - name: Upload Release Asset + id: upload-release-asset-2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: actions/upload-release-asset@v1 + with: + upload_url: ${{ needs.create-release.outputs.release-asset-upload-url }} + asset_path: ${{ steps.upload-build-artifact-2.outputs.artifact-url }} asset_name: Build_Release.zip asset_content_type: application/zip diff --git a/.github/workflows/deploy-release-binaries.yml b/.github/workflows/deploy-release-binaries.yml deleted file mode 100644 index 2a6d144..0000000 --- a/.github/workflows/deploy-release-binaries.yml +++ /dev/null @@ -1,120 +0,0 @@ -# This script builds the end user installer for Folder Size Calculator -name: deploy-release-binaries -run-name: Release deploy for ${{ github.event_name }} triggered by ${{ github.triggering_actor }} -concurrency: - group: release-binaries - cancel-in-progress: true -on: - # push: - # branches: - # - master - # paths-ignore: - # - README.md - # - CHANGELOG.md # Should never be edited anyway - # - .gitignore - # - .github/** - workflow_dispatch: - -jobs: - build-and-release-binaries: - runs-on: windows-latest - steps: - # get the latest code from the repo - - name: Checkout Code - uses: actions/checkout@v4 - - # display environment variables, for audit purposes - - name: Check Environment - run: | - dir env: - - # add msbuild to the PATH variable - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1 - - # create the output folder - - name: Create Build Directory - run: mkdir _build - - # run msbuild to compile the code - - name: build executable - id: build-ui-executable - working-directory: Solution - run: | - msbuild.exe ` - TrangTest.sln ` - /nologo ` - /nr:false ` - /p:DeployOnBuild=true ` - /p:DeployDefaultTarget=WebPublish ` - /p:WebPublishMethod=FileSystem ` - /p:DeleteExistingFiles=True ` - /p:platform="Any CPU" ` - /p:configuration="Release" ` - /p:PublishUrl="..\_build" ` - -fl - - # send build log to github output - - name: Upload Build Log - id: upload-build-log - uses: actions/upload-artifact@v4 - with: - name: build-executable-log - path: ${{ github.workspace }}\Solution\msbuild.log - retention-days: 5 - - # check for success before continuing - - name: Upload Check - id: upload-check - if: ${{ steps.build-ui-executable.outcome != 'success' }} - uses: actions/github-script@v7 - with: - script: | - core.setFailed('user-installer build failed, no sense continuing...') - - # # create a tag and a release - # - name: Create Tag & Release - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # id: release - # uses: rymndhng/release-on-push-action@master - # with: - # bump_version_scheme: patch - # tag_prefix: v - # use_github_release_notes: true - # release_name: "Release " - # release_body: "Bug fixes and features for stability of the application." - - # # display the output of the release - # - name: Check Output Parameters - # run: | - # echo "Got tag name ${{ steps.release.outputs.tag_name }}" - # echo "Got release version ${{ steps.release.outputs.version }}" - # echo "Upload release artifacts to ${{ steps.release.outputs.upload_url }}" - - # zip the build output - - name: zip build artifact - id: zip-build-artifact - run: | - 7z a -tzip ${{ github.workspace }}\Build_Release.zip ${{ github.workspace }}\Solution\TrangTestStub\bin\Release\* - - # send build artifact to github output - - name: Upload Build Artifact - id: upload-build-artifact - uses: actions/upload-artifact@v4 - with: - name: build-executable-artifact - path: ${{ github.workspace }}\Build_Release.zip - retention-days: 5 - - # # upload the build artifact to the release on github - # - name: Upload Release Asset - # id: upload-release-asset - # uses: actions/upload-release-asset@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # upload_url: ${{ steps.release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - # asset_path: ${{ github.workspace }}\Build_Release.zip - # asset_name: Build_Release.zip - # asset_content_type: application/zip