Skip to content

Commit

Permalink
Fix ci & wxs not being updated to new gui name
Browse files Browse the repository at this point in the history
  • Loading branch information
maddymakesgames committed Mar 22, 2024
1 parent 1238f96 commit b99bb3f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ jobs:
# this is necessary for github pages where the site is deployed to username.github.io/repo_name and all files must be requested
# relatively as eframe_template/favicon.ico. if we skip public-url option, the href paths will instead request username.github.io/favicon.ico which
# will obviously return error 404 not found.
run: ./trunk build --release --public-url "/${GITHUB_REPOSITORY#*/}" ./save_gui/index.html
run: ./trunk build --release --public-url "/${GITHUB_REPOSITORY#*/}" ./gui/index.html
- name: Deploy
uses: JamesIves/github-pages-deploy-action@v4
with:
folder: save_gui/dist
folder: gui/dist
# this option will not maintain any history of your previous pages deployment
# set to false if you want all page build to be committed to your gh-pages branch history
single-commit: true
2 changes: 1 addition & 1 deletion .github/workflows/rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,4 @@ jobs:
- name: Download and install Trunk binary
run: wget -qO- https://github.com/thedodd/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf-
- name: Build
run: ./trunk build ./save_gui/index.html
run: ./trunk build ./gui/index.html
8 changes: 4 additions & 4 deletions gui/wix/main.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@
DowngradeErrorMessage='A newer version of [ProductName] is already installed. Setup will now exit.'/>

<Media Id='1' Cabinet='media1.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1'/>
<Property Id='DiskPrompt' Value='save_gui Installation'/>
<Property Id='DiskPrompt' Value='celeste_rs_gui Installation'/>

<Directory Id='TARGETDIR' Name='SourceDir'>
<Directory Id='$(var.PlatformProgramFilesFolder)' Name='PFiles'>
<Directory Id='APPLICATIONFOLDER' Name='save_gui'>
<Directory Id='APPLICATIONFOLDER' Name='celeste_rs_gui'>

<!--
Enabling the license sidecar file in the installer is a four step process:
Expand Down Expand Up @@ -123,9 +123,9 @@
<Component Id='binary0' Guid='*'>
<File
Id='exe0'
Name='save_gui.exe'
Name='celeste_rs_gui.exe'
DiskId='1'
Source='$(var.CargoTargetBinDir)\save_gui.exe'
Source='$(var.CargoTargetBinDir)\celeste_rs_gui.exe'
KeyPath='yes'/>
</Component>
</Directory>
Expand Down

0 comments on commit b99bb3f

Please sign in to comment.