Skip to content

Commit 1744241

Browse files
committed
fix the deploy still
1 parent 214a72d commit 1744241

File tree

4 files changed

+16
-28
lines changed

4 files changed

+16
-28
lines changed

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
run: |
142142
mkdir target/release/assets && cp -r assets target/release/assets
143143
mkdir target/release/credits && cp -r credits target/release/credits
144-
mkdir target/release/scripts && cp -r credits target/release/scripts
144+
mkdir target/release/scripts && cp -r scripts target/release/scripts
145145
- name: Zip release
146146
uses: vimtor/action-zip@v1
147147
with:

build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ fn main() {
77
// on windows we will set our game icon as icon for the executable
88
embed_resource::compile("build/windows/icon.rc");
99
}
10-
}
10+
}

build/windows/installer/Installer.wixproj

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,29 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<HarvestDirectory Include="..\..\..\assets">
13+
<HarvestDirectory Include="..\..\..\target\release\assets">
1414
<ComponentGroupName>AssetsDirectory</ComponentGroupName>
1515
<DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
1616
<SuppressRootDirectory>false</SuppressRootDirectory>
1717
</HarvestDirectory>
18-
<BindPath Include="..\..\..\assets" />
18+
<BindPath Include="..\..\..\target\release\assets" />
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<HarvestDirectory Include="..\..\..\credits">
22+
<HarvestDirectory Include="..\..\..\target\release\credits">
2323
<ComponentGroupName>CreditsDirectory</ComponentGroupName>
2424
<DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
2525
<SuppressRootDirectory>false</SuppressRootDirectory>
2626
</HarvestDirectory>
27-
<BindPath Include="..\..\..\credits" />
27+
<BindPath Include="..\..\..\target\release\credits" />
28+
</ItemGroup>
29+
30+
<ItemGroup>
31+
<HarvestDirectory Include="..\..\..\target\release\scripts">
32+
<ComponentGroupName>ScriptsDirectory</ComponentGroupName>
33+
<DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
34+
<SuppressRootDirectory>false</SuppressRootDirectory>
35+
</HarvestDirectory>
36+
<BindPath Include="..\..\..\target\release\scripts" />
2837
</ItemGroup>
2938
</Project>

build/windows/installer/Package.wxs

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727

2828
<Feature Id="Main">
2929
<ComponentGroupRef Id="MainComponent" />
30-
<ComponentRef Id="StartMenuShortcut" />
3130
<ComponentGroupRef Id="AssetsDirectory" />
3231
<ComponentGroupRef Id="CreditsDirectory" />
3332
<ComponentGroupRef Id="ScriptsDirectory" />
33+
<ComponentRef Id="StartMenuShortcut" />
3434
</Feature>
3535

3636
<!-- Installs the actual files -->
@@ -40,27 +40,6 @@
4040
</Component>
4141
</ComponentGroup>
4242

43-
<!-- Assets Directory -->
44-
<ComponentGroup Id="AssetsDirectory" Directory="INSTALLFOLDER">
45-
<Component>
46-
<File Source="..\..\..\target\assets\*" />
47-
</Component>
48-
</ComponentGroup>
49-
50-
<!-- Credits Directory -->
51-
<ComponentGroup Id="CreditsDirectory" Directory="INSTALLFOLDER">
52-
<Component>
53-
<File Source="..\..\..\target\credits\*" />
54-
</Component>
55-
</ComponentGroup>
56-
57-
<!-- Scripts Directory -->
58-
<ComponentGroup Id="CreditsDirectory" Directory="INSTALLFOLDER">
59-
<Component>
60-
<File Source="..\..\..\target\scripts\*" />
61-
</Component>
62-
</ComponentGroup>
63-
6443
<!-- Start menu shortcut -->
6544
<!-- Source: https://wixtoolset.org/docs/v3/howtos/files_and_registry/create_start_menu_shortcut/ -->
6645
<StandardDirectory Id="ProgramMenuFolder">

0 commit comments

Comments
 (0)