Skip to content

Commit c6c6566

Browse files
authored
Merge pull request #25 from vicentefelipechile/main
Changed the compiler to the main branch and added version formatting
2 parents bdd776d + 4b40a75 commit c6c6566

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

.github/workflows/rust.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ name: Rust
22

33
on:
44
push:
5-
branches: [ "dev" ]
5+
branches: [ "main" ]
66
pull_request:
7-
branches: [ "dev" ]
7+
branches: [ "main" ]
88

99
env:
1010
CARGO_TERM_COLOR: always
11+
VERSION_MAJOR: 1
12+
VERSION_MINOR: 0
1113

1214
jobs:
1315
build_windows:
@@ -39,8 +41,8 @@ jobs:
3941
env:
4042
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
4143
with:
42-
tag_name: ${{ github.run_number }}
43-
release_name: Release ${{ github.run_number }}
44+
tag_name: v${{ env.VERSION_MAJOR }}.${{ env.VERSION_MINOR }}.${{ github.run_number }}
45+
release_name: Release ${{ env.VERSION_MAJOR }}.${{ env.VERSION_MINOR }}.${{ github.run_number }}
4446

4547
- name: Upload MSI
4648
id: upload-release-asset-msi
@@ -50,7 +52,7 @@ jobs:
5052
with:
5153
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
5254
asset_path: ./src-tauri/target/release/bundle/msi/file-explorer_0.0.0_x64_en-US.msi
53-
asset_name: file-explorer_${{ github.run_number }}_x64_en-US.msi
55+
asset_name: file-explorer_${{ env.VERSION_MAJOR }}.${{ env.VERSION_MINOR }}.${{ github.run_number }}_x64_en-US.msi
5456
asset_content_type: application/x-msi
5557

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

0 commit comments

Comments
 (0)