diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml index bb486a6..5e549cc 100644 --- a/.github/workflows/build-deploy.yml +++ b/.github/workflows/build-deploy.yml @@ -63,6 +63,21 @@ jobs: runs-on: windows-latest needs: test steps: +<<<<<<< HEAD + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Set Release Version + id: set_release_version + shell: bash + run: | + version=$(cat ConfigCreator/version.txt) + commit=$(git rev-parse --short HEAD) + release_version="${version}-${commit}" + echo "release_version=$release_version" >> $GITHUB_OUTPUT + +======= +>>>>>>> 37ca5cff5a7cbba0fb5b21b8f3176b4581b68046 - name: Download build artifact uses: actions/download-artifact@v4 with: @@ -75,8 +90,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: v${{ github.run_number }} - release_name: Release ${{ github.run_number }} + tag_name: v${{ steps.set_release_version.outputs.release_version }} + release_name: Release ${{ steps.set_release_version.outputs.release_version }} draft: false prerelease: false @@ -87,5 +102,5 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: release.zip - asset_name: ConfigCreator.zip + asset_name: ConfigCreator-${{ steps.set_release_version.outputs.release_version }}.zip asset_content_type: application/zip