Skip to content

Commit

Permalink
Finalise v1.10.1, which fixes v1.10 reporting empty string as its ver…
Browse files Browse the repository at this point in the history
…sion
  • Loading branch information
jacquesh committed Aug 30, 2024
1 parent 40cdee2 commit e4a7a0d
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 6 deletions.
15 changes: 9 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,19 @@ jobs:
needs: run-tests

steps:
- name: Print installed Windows SDK versions
shell: pwsh
continue-on-error: true
run: Get-ChildItem -Name "HKLM:\SOFTWARE\Microsoft\Windows Kits\Installed Roots"

- name: Add MSBuild to the PATH
uses: microsoft/setup-msbuild@v2

- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0 # Fetch all the history so that `git describe` works to generate the version header
fetch-tags: true

- name: Print git tag description
shell: pwsh
continue-on-error: false
run: git describe HEAD

- name: Build 32-bit binary
run: msbuild /r /m /p:Configuration=Release /p:Platform=x86 build\foo_openlyrics.sln
Expand Down Expand Up @@ -61,7 +64,7 @@ jobs:
- name: Create GitHub release
id: release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
files: |
${{ env.RELEASE_NAME }}.fb2k-component
Expand Down
5 changes: 5 additions & 0 deletions build/generate_version_header.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ param (
[string]$output_path
)
$version_string = git describe HEAD
if ([string]::IsNullOrEmpty($version_string)) {
Write-Output "Failed to compute commit description, git returned an empty string, terminating..."
return 1
}

if ($version_string[0] -Ne 'v') {
Write-Output "Current commit description ""$version_string"" does not have the expected format, terminating..."
Return 1
Expand Down
3 changes: 3 additions & 0 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ void OpenLyricsVersion::get_about_message(pfc::string_base & out)
out += "You can support development at https://www.buymeacoffee.com/jacquesheunis\n";
out += "\nChangelog:\n";
// out += "Version " OPENLYRICS_VERSION " (" __DATE__ "):\n"
out += "Version 1.10.1 (2024-08-30):\n"
"- Fix version 1.10 not having any version at all in the fb2k components UI\n"
"\n";
out += "Version 1.10 (2024-08-30):\n"
"- Add a source for LRCLIB (https://lrclib.net)\n"
"- Add a source for SongLyrics.com\n"
Expand Down

0 comments on commit e4a7a0d

Please sign in to comment.