Skip to content

Commit

Permalink
Merge pull request #25 from vicentefelipechile/main
Browse files Browse the repository at this point in the history
Changed the compiler to the main branch and added version formatting
  • Loading branch information
conaticus authored Jun 28, 2023
2 parents bdd776d + 4b40a75 commit c6c6566
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ name: Rust

on:
push:
branches: [ "dev" ]
branches: [ "main" ]
pull_request:
branches: [ "dev" ]
branches: [ "main" ]

env:
CARGO_TERM_COLOR: always
VERSION_MAJOR: 1
VERSION_MINOR: 0

jobs:
build_windows:
Expand Down Expand Up @@ -39,8 +41,8 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
with:
tag_name: ${{ github.run_number }}
release_name: Release ${{ github.run_number }}
tag_name: v${{ env.VERSION_MAJOR }}.${{ env.VERSION_MINOR }}.${{ github.run_number }}
release_name: Release ${{ env.VERSION_MAJOR }}.${{ env.VERSION_MINOR }}.${{ github.run_number }}

- name: Upload MSI
id: upload-release-asset-msi
Expand All @@ -50,7 +52,7 @@ jobs:
with:
upload_url: ${{ steps.create_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: ./src-tauri/target/release/bundle/msi/file-explorer_0.0.0_x64_en-US.msi
asset_name: file-explorer_${{ github.run_number }}_x64_en-US.msi
asset_name: file-explorer_${{ env.VERSION_MAJOR }}.${{ env.VERSION_MINOR }}.${{ github.run_number }}_x64_en-US.msi
asset_content_type: application/x-msi

- name: Upload Executable
Expand All @@ -61,5 +63,5 @@ jobs:
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./src-tauri/target/release/bundle/nsis/file-explorer_0.0.0_x64-setup.exe
asset_name: file-explorer_${{ github.run_number }}_x64-setup.exe
asset_name: file-explorer_${{ env.VERSION_MAJOR }}.${{ env.VERSION_MINOR }}.${{ github.run_number }}_x64-setup.exe
asset_content_type: application/x-msdownload

0 comments on commit c6c6566

Please sign in to comment.