Skip to content

Commit

Permalink
hotfix pipeline and About page
Browse files Browse the repository at this point in the history
Fixes #212
  • Loading branch information
Foxlider committed Oct 13, 2024
1 parent 2f80485 commit 4017482
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,18 @@ jobs:
# Take the first tag as latestTag
$latestTag = ($tags -split "`n")[0]
$range = "$latestTag" + "..@"
# Get changes for range
# Check if the latest tag is on the last commit
$latestCommit = git rev-parse HEAD
$latestTagCommit = git rev-list -n 1 $latestTag
if ($latestCommit -eq $latestTagCommit -and $countTags -gt 1) {
# Use the previous tag if the latest tag is on the last commit
$latestTag = ($tags -split "`n")[1]
}
$range = "$latestTag" + "..@"
$changes = git log --pretty=reference --no-decorate $range
Expand Down
2 changes: 1 addition & 1 deletion FASTER/FASTER.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>FASTERKey.snk</AssemblyOriginatorKeyFile>
<Authors>Keelah Fox, Jupster, Canno.n</Authors>
<Version>1.9.6.0</Version>
<Version>1.9.6.1</Version>
<Company>FoxliCorp.</Company>
<Description>Fox's Arma Server Tool Extended Rewrite</Description>
<Copyright>Copyright © 2019</Copyright>
Expand Down
2 changes: 1 addition & 1 deletion FASTER/Views/About.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
</Button>
<Button Grid.Column="2" HorizontalAlignment="Center" Style="{DynamicResource MahApps.Styles.Button.MetroSquare.Accent}" Name="IDiscordButton" Click="IDiscordButton_Click">
<StackPanel Orientation="Horizontal">
<iconPacks:PackIconMaterial Kind="Discord" />
<iconPacks:PackIconMaterial Kind="Chat" />
<TextBlock Margin="8 0 0 0" VerticalAlignment="Center">Discord</TextBlock>
</StackPanel>
</Button>
Expand Down
2 changes: 1 addition & 1 deletion FASTER_Version.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.9.6.0</version>
<version>1.9.6.1</version>
<url>https://github.com/Foxlider/FASTER/releases/latest/download/Release_x64.zip</url>
<changelog>https://github.com/Foxlider/FASTER/releases</changelog>
<mandatory>true</mandatory>
Expand Down

0 comments on commit 4017482

Please sign in to comment.