Skip to content

Commit b158c7c

Browse files
jonko0493jonko0493
authored
Update NuGet packages, update official build version, and hide updater in Flatpak (#557)
1 parent b83a393 commit b158c7c

File tree

11 files changed

+87
-108
lines changed

11 files changed

+87
-108
lines changed

‎.github/workflows/official-build.yml‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
name: Serial Loops Official Build
22
run-name: "Official release build for Serial Loops"
33
on:
4-
# schedule:
5-
# - cron: '35 0 * * *'
6-
# - cron: '35 4 * * *'
7-
# - cron: '35 8 * * *'
8-
# - cron: '35 12 * * *'
9-
# - cron: '35 16 * * *'
10-
# - cron: '35 20 * * *'
114
push:
125
branches:
136
- 'main'
@@ -26,25 +19,11 @@ permissions:
2619
contents: write
2720

2821
env:
29-
SLVersion: ${{ inputs.version == '' && format('0.3.apre.{0}', github.run_number) || inputs.version }}
30-
SLAssemblyVersion: ${{ inputs.version == '' && format('0.3.8888.{0}', github.run_number) || inputs.version }}
22+
SLVersion: ${{ inputs.version == '' && format('0.4.apre.{0}', github.run_number) || inputs.version }}
23+
SLAssemblyVersion: ${{ inputs.version == '' && format('0.4.8888.{0}', github.run_number) || inputs.version }}
3124

3225
jobs:
33-
# check-new-commits:
34-
# runs-on: ubuntu-latest
35-
# steps:
36-
# - name: Check out
37-
# uses: actions/checkout@v4
38-
# - name: Check if new commits
39-
# run: echo "NEW_COMMIT_COUNT=$(git log --oneline --since '24 hours ago' | wc -l)" >> $GITHUB_ENV
40-
# if: ${{ github.event_name == 'schedule' }}
41-
# - name: Pass because dispatched
42-
# run: echo "NEW_COMMIT_COUNT=1" >> $GITHUB_ENV
43-
# if: ${{ github.event_name != 'schedule' }}
44-
4526
linux-flatpak-setup:
46-
# needs: check-new-commits
47-
# if: ${{ github.env.NEW_COMMIT_COUNT > 0 }}
4827
runs-on: ubuntu-latest
4928
steps:
5029
- name: Check out
@@ -113,8 +92,6 @@ jobs:
11392

11493
linux-appimage:
11594
runs-on: ubuntu-latest
116-
# needs: check-new-commits
117-
# if: ${{ github.env.NEW_COMMIT_COUNT > 0 }}
11895
steps:
11996
- name: Check out
12097
uses: actions/checkout@v4
@@ -146,8 +123,6 @@ jobs:
146123
retention-days: 1
147124

148125
linux-dpkg-tarball:
149-
# needs: check-new-commits
150-
# if: ${{ github.env.NEW_COMMIT_COUNT > 0 }}
151126
runs-on: ubuntu-latest
152127
steps:
153128
- name: Check out
@@ -192,8 +167,6 @@ jobs:
192167
retention-days: 1
193168

194169
linux-rpm:
195-
# needs: check-new-commits
196-
# if: ${{ github.env.NEW_COMMIT_COUNT > 0 }}
197170
runs-on: ubuntu-latest
198171
container:
199172
image: fedora:39
@@ -218,8 +191,6 @@ jobs:
218191
retention-days: 1
219192

220193
macos-pkg:
221-
# needs: check-new-commits
222-
# if: ${{ github.env.NEW_COMMIT_COUNT > 0 }}
223194
runs-on: macos-latest
224195
strategy:
225196
matrix:
@@ -267,8 +238,6 @@ jobs:
267238
retention-days: 1
268239

269240
windows:
270-
# needs: check-new-commits
271-
# if: ${{ github.env.NEW_COMMIT_COUNT > 0 }}
272241
runs-on: windows-latest
273242
steps:
274243
- name: Check out
@@ -306,7 +275,6 @@ jobs:
306275
retention-days: 1
307276

308277
release:
309-
# if: ${{ github.env.NEW_COMMIT_COUNT != '0' }}
310278
runs-on: ubuntu-latest
311279
needs: [ linux-flatpak, linux-appimage, linux-dpkg-tarball, linux-rpm, macos-pkg, windows ]
312280
steps:

‎NuGet.Config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
<packageSources>
44
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
55
<add key="haroohie" value="https://pkgs.dev.azure.com/jonko0493/haroohie-public/_packaging/haroohie/nuget/v3/index.json" />
6-
<add key="avalonia-nightly" value="https://nuget-feed-nightly.avaloniaui.net/v3/index.json" />
76
</packageSources>
87
</configuration>

‎install/linux/flatpak/patches/sandbox.patch‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/src/SerialLoops.Lib/PatchableConstants.cs b/src/SerialLoops.Lib/PatchableConstants.cs
2-
index 3fb563d..946f308 100644
2+
index 5c2c761..dda7cc7 100644
33
--- a/src/SerialLoops.Lib/PatchableConstants.cs
44
+++ b/src/SerialLoops.Lib/PatchableConstants.cs
5-
@@ -6,9 +6,9 @@ namespace SerialLoops.Lib;
5+
@@ -6,10 +6,10 @@ namespace SerialLoops.Lib;
66
// go more smoothly
77
public static class PatchableConstants
88
{
@@ -11,9 +11,11 @@ index 3fb563d..946f308 100644
1111
- public static string[] FlatpakProcessBaseArgs => [];
1212
- public const string FlatpakRunProcess = "";
1313
- public static string[] FlatpakRunProcessBaseArgs => [];
14+
- public const bool UseUpdater = true;
1415
+ public static string UnixDefaultDevkitArmDir => Path.Combine("/app", "opt", "devkitpro", "devkitARM");
1516
+ public const string FlatpakProcess = "flatpak-spawn";
1617
+ public static string[] FlatpakProcessBaseArgs => ["--host", "flatpak"];
1718
+ public const string FlatpakRunProcess = "flatpak-spawn";
1819
+ public static string[] FlatpakRunProcessBaseArgs => ["--host"];
20+
+ public const bool UseUpdater = false;
1921
}

‎src/SerialLoops.Lib/PatchableConstants.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ public static class PatchableConstants
1111
public static string[] FlatpakProcessBaseArgs => [];
1212
public const string FlatpakRunProcess = "";
1313
public static string[] FlatpakRunProcessBaseArgs => [];
14+
public const bool UseUpdater = true;
1415
}

‎src/SerialLoops.Lib/SerialLoops.Lib.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
<ItemGroup>
1212
<PackageReference Include="BunLabs.NAudio.Flac" Version="2.0.1" />
1313
<PackageReference Include="Concentus.Oggfile" Version="1.0.6" />
14-
<PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.0.1" />
15-
<PackageReference Include="HarfBuzzSharp.NativeAssets.macOS" Version="8.3.0.1" />
14+
<PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.1.1" />
15+
<PackageReference Include="HarfBuzzSharp.NativeAssets.macOS" Version="8.3.1.1" />
1616
<PackageReference Include="HaroohieClub.NitroPacker" Version="3.1.7" />
1717
<PackageReference Include="HaruhiChokuretsuLib" Version="0.54.1" />
1818
<PackageReference Include="NAudio.Vorbis" Version="1.5.0" />
1919
<PackageReference Include="NLayer" Version="1.16.0" />
2020
<PackageReference Include="NLayer.NAudioSupport" Version="1.4.0" />
2121
<PackageReference Include="QuikGraph" Version="2.5.0" />
22-
<PackageReference Include="ReactiveUI" Version="20.2.45" />
22+
<PackageReference Include="ReactiveUI" Version="20.4.1" />
2323
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
2424
<PackageReference Include="SoftCircuits.OrderedDictionary" Version="3.3.0" />
2525
<PackageReference Include="Topten.RichTextKit" Version="0.4.167" />

‎src/SerialLoops/App.axaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
xmlns:controls="using:SerialLoops.Controls"
77
xmlns:dialoghost="using:DialogHostAvalonia"
88
xmlns:toolbar="using:MiniToolbar.Avalonia"
9+
xmlns:lib="using:SerialLoops.Lib"
910
xmlns:local="using:SerialLoops"
1011
xmlns:mintoolbarthemes="using:MiniToolbar.Avalonia.Themes"
1112
xmlns:tabaloniathemes="using:Tabalonia.Themes.Custom"
@@ -24,7 +25,8 @@
2425
<NativeMenuItemSeparator />
2526
<NativeMenuItem Header="{x:Static assets:Strings._Preferences___}"
2627
Icon="avares://SerialLoops/Assets/Icons/Options.png" Click="Preferences_Click" />
27-
<NativeMenuItem Header="{x:Static assets:Strings._Check_for_Updates___}"
28+
<NativeMenuItem IsVisible="{x:Static lib:PatchableConstants.UseUpdater}"
29+
Header="{x:Static assets:Strings._Check_for_Updates___}"
2830
Icon="avares://SerialLoops/Assets/Icons/Update.png" Click="Updates_Click" />
2931
<NativeMenuItem Header="{x:Static assets:Strings.View__Logs}" Click="Logs_Click" />
3032
<NativeMenuItem Header="{x:Static assets:Strings.View_Crash_Log}" Click="CrashLog_Click"/>

0 commit comments

Comments
 (0)