Skip to content

misc: Use the corrent version string everywhere #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artempyanykh merged 3 commits into from
Nov 30, 2025
Merged

misc: Use the corrent version string everywhere #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c41e0b2
misc: Use the corrent version string everywhere
artempyanykh Nov 30, 2025
c1cfee5
fix: Fetch tags on CI so that the version script works
artempyanykh Nov 30, 2025
1ba0cb5
fix: Fetch all git history in CI actions
artempyanykh Nov 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
fetch-tags: true

- name: Setup dotnet
uses: actions/setup-dotnet@v3
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ jobs:
task: macosUniversalBinary
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
fetch-tags: true
- name: Setup dotnet
uses: actions/setup-dotnet@v3
with:
Expand Down
11 changes: 9 additions & 2 deletions Marksman/Fatality.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
module Marksman.Fatality

open System.Reflection
open Ionide.LanguageServerProtocol.Types

open Marksman.Misc
open Marksman.State
open Marksman.Workspace

let abort (stateOpt: Option<State>) (ex: exn) =
let marksmanAssembly = typeof<State>.Assembly.GetName()
let marksmanAssembly = typeof<State>.Assembly

let marksmanVersion =
marksmanAssembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()
|> Option.ofObj
|> Option.map (fun attr -> attr.InformationalVersion)
|> Option.defaultValue (marksmanAssembly.GetName().Version.ToString())

let clientDebugOut ({ Name = name; Version = versionOpt }: ClientInfo) =
eprintf $"Client: {name}"
Expand Down Expand Up @@ -35,7 +42,7 @@ let abort (stateOpt: Option<State>) (ex: exn) =
eprintfn "Marksman encountered a fatal error"
eprintfn "Please, report the error at https://github.com/artempyanykh/marksman/issues"
eprintfn "---------------------------------------------------------------------------"
eprintfn $"Marksman version: {marksmanAssembly.Version}"
eprintfn $"Marksman version: {marksmanVersion}"
eprintfn $"OS: {System.Runtime.InteropServices.RuntimeInformation.OSDescription}"
eprintfn $"Arch: {System.Runtime.InteropServices.RuntimeInformation.OSArchitecture}"
Option.iter stateDebugOut stateOpt
Expand Down
16 changes: 8 additions & 8 deletions Marksman/Marksman.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<Target Name="Version" BeforeTargets="BeforeBuild">
<Exec Command="git describe --always --dirty" ConsoleToMSBuild="true" Condition="'$(VersionString)'==''">
<Exec Command="git describe --tags --long --always --dirty" ConsoleToMSBuild="true" Condition="'$(VersionString)'==''">
<Output TaskParameter="ConsoleOutput" PropertyName="VersionString"/>
</Exec>
<PropertyGroup>
<VersionSuffix>$(VersionString)</VersionSuffix>
<VersionSuffix Condition="$(VersionString.StartsWith('0'))">r$(VersionString)</VersionSuffix>
<Version>$(VersionPrefix)-$(VersionSuffix)</Version>
<Version>$(VersionSuffix)</Version>
</PropertyGroup>
</Target>
<ItemGroup>
Expand Down Expand Up @@ -58,14 +58,14 @@
<Compile Include="Program.fs"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="FSharp.SystemCommandLine" Version="2.0.0" />
<PackageReference Include="FSharpPlus" Version="1.8.0" />
<PackageReference Include="FSharp.SystemCommandLine" Version="2.0.0"/>
<PackageReference Include="FSharpPlus" Version="1.8.0"/>
<PackageReference Include="Glob" Version="1.1.9"/>
<PackageReference Include="Markdig" Version="0.43.0" />
<PackageReference Include="Markdig" Version="0.43.0"/>
<!-- <PackageReference Include="Ionide.LanguageServerProtocol" Version="0.3.1" />-->
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Tomlyn" Version="0.19.0" />
<PackageReference Include="Serilog" Version="2.12.0"/>
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0"/>
<PackageReference Include="Tomlyn" Version="0.19.0"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LanguageServerProtocol\LanguageServerProtocol.fsproj"/>
Expand Down