diff --git a/.github/workflows/build-windows-executable-app.yaml b/.github/workflows/build-windows-executable-app.yaml
index 54f29337..4e029c8e 100644
--- a/.github/workflows/build-windows-executable-app.yaml
+++ b/.github/workflows/build-windows-executable-app.yaml
@@ -279,37 +279,40 @@ jobs:
echo " [server]" >> streamlit_exe/Readme.txt
echo " port = 8502" >> streamlit_exe/Readme.txt
echo "" >> streamlit_exe/Readme.txt
- echo "Need Help?" >> streamlit_exe/Readme.txt
+ echo "Reach out to us:" >> streamlit_exe/Readme.txt
echo "- Join our Discord server for support and community discussions: https://discord.com/invite/4TAGhqJ7s5" >> streamlit_exe/Readme.txt
+ echo "- Contribute or stay updated with the latest OpenMS web app developments on GitHub: https://github.com/OpenMS/streamlit-template" >> streamlit_exe/Readme.txt
+ echo "- Visit our website for more information: https://openms.de/" >> streamlit_exe/Readme.txt
echo "" >> streamlit_exe/Readme.txt
echo "Thank you for using ${{ env.APP_NAME }}!" >> streamlit_exe/Readme.txt
-
+
- name: Install WiX Toolset
run: |
curl -LO https://github.com/wixtoolset/wix3/releases/download/wix3111rtm/wix311-binaries.zip
unzip wix311-binaries.zip -d wix
rm wix311-binaries.zip
- - name: build .wxs for streamlit_exe folder
+ - name: Build .wxs for streamlit_exe folder
run: |
- ./wix/heat.exe dir streamlit_exe -gg -sfrag -sreg -srd -template component -cg StreamlitExeFiles -dr INSTALLFOLDER -out streamlit_exe_files.wxs
+ ./wix/heat.exe dir streamlit_exe -gg -sfrag -sreg -srd -template component -cg StreamlitExeFiles -dr AppSubFolder -out streamlit_exe_files.wxs
- name: Prepare SourceDir
run: |
mkdir SourceDir
mv streamlit_exe/* SourceDir
cp assets/openms_license.rtf SourceDir
+ # Logo of app
cp assets/openms.ico SourceDir
-
+
- name: Generate WiX XML file
run: |
echo '' > streamlit_exe.wxs
echo '' >> streamlit_exe.wxs
- echo ' ' >> streamlit_exe.wxs
- echo ' ' >> streamlit_exe.wxs
+ echo ' ' >> streamlit_exe.wxs
+ echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
-
- # Folder Structure
+
+ # Folder structure
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
@@ -320,21 +323,21 @@ jobs:
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
-
- # Add component
+
+ # Add components
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
-
- # Create shortcut for run App on Desktop
+
+ # Create shortcut for run app on desktop
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
- # Create shortcut for run App in Installer folder
+ # Create shortcut for run App in installer folder
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
@@ -350,7 +353,7 @@ jobs:
# Run app directly after installation
echo ' > streamlit_exe.wxs
echo ' ExeCommand="cmd.exe /c "[AppSubFolder]${{ env.APP_NAME }}.bat"" />' >> streamlit_exe.wxs
-
+
# Run Bat file during uninstallation
echo ' > streamlit_exe.wxs
echo ' ExeCommand="cmd.exe /c del /f /q [AppSubFolder]${{ env.APP_NAME }}.bat"" />' >> streamlit_exe.wxs
@@ -361,6 +364,8 @@ jobs:
echo ' NOT REMOVE' >> streamlit_exe.wxs
echo ' REMOVE="ALL"' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
+
+ # Interface options
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
@@ -371,19 +376,17 @@ jobs:
echo ' ' >> streamlit_exe.wxs
echo '' >> streamlit_exe.wxs
- - name: Build msi
+ - name: Build .wixobj file with candle.exe
run: |
./wix/candle.exe streamlit_exe.wxs streamlit_exe_files.wxs
+
+ - name: Link .wixobj file into .msi with light.exe
+ run: |
./wix/light.exe -ext WixUIExtension -sice:ICE60 -o ${{ env.APP_NAME }}.msi streamlit_exe_files.wixobj streamlit_exe.wixobj
-
- - name: Delete OpenMS bin artifact
- uses: geekyeggo/delete-artifact@v5
- with:
- name: openms-package
-
+
- name: Archive build artifacts
uses: actions/upload-artifact@v4
with:
- name: ${{ env.APP_NAME }}
+ name: OpenMS-App
path: |
- ${{ env.APP_NAME }}.msi
+ ${{ env.APP_NAME }}.msi
\ No newline at end of file
diff --git a/.github/workflows/test-win-exe-w-embed-py.yaml b/.github/workflows/test-win-exe-w-embed-py.yaml
index e1d3ab71..de04af45 100644
--- a/.github/workflows/test-win-exe-w-embed-py.yaml
+++ b/.github/workflows/test-win-exe-w-embed-py.yaml
@@ -68,37 +68,40 @@ jobs:
echo " [server]" >> streamlit_exe/Readme.txt
echo " port = 8502" >> streamlit_exe/Readme.txt
echo "" >> streamlit_exe/Readme.txt
- echo "Need Help?" >> streamlit_exe/Readme.txt
+ echo "Reach out to us:" >> streamlit_exe/Readme.txt
echo "- Join our Discord server for support and community discussions: https://discord.com/invite/4TAGhqJ7s5" >> streamlit_exe/Readme.txt
+ echo "- Contribute or stay updated with the latest OpenMS web app developments on GitHub: https://github.com/OpenMS/streamlit-template" >> streamlit_exe/Readme.txt
+ echo "- Visit our website for more information: https://openms.de/" >> streamlit_exe/Readme.txt
echo "" >> streamlit_exe/Readme.txt
echo "Thank you for using ${{ env.APP_NAME }}!" >> streamlit_exe/Readme.txt
-
+
- name: Install WiX Toolset
run: |
curl -LO https://github.com/wixtoolset/wix3/releases/download/wix3111rtm/wix311-binaries.zip
unzip wix311-binaries.zip -d wix
rm wix311-binaries.zip
- - name: build .wxs for streamlit_exe folder
+ - name: Build .wxs for streamlit_exe folder
run: |
- ./wix/heat.exe dir streamlit_exe -gg -sfrag -sreg -srd -template component -cg StreamlitExeFiles -dr INSTALLFOLDER -out streamlit_exe_files.wxs
+ ./wix/heat.exe dir streamlit_exe -gg -sfrag -sreg -srd -template component -cg StreamlitExeFiles -dr AppSubFolder -out streamlit_exe_files.wxs
- name: Prepare SourceDir
run: |
mkdir SourceDir
mv streamlit_exe/* SourceDir
cp assets/openms_license.rtf SourceDir
+ # Logo of app
cp assets/openms.ico SourceDir
-
+
- name: Generate WiX XML file
run: |
echo '' > streamlit_exe.wxs
echo '' >> streamlit_exe.wxs
- echo ' ' >> streamlit_exe.wxs
- echo ' ' >> streamlit_exe.wxs
+ echo ' ' >> streamlit_exe.wxs
+ echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
-
- # Folder Structure
+
+ # Folder structure
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
@@ -109,21 +112,21 @@ jobs:
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
-
- # Add component
+
+ # Add components
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
-
- # Create shortcut for run App on Desktop
+
+ # Create shortcut for run app on desktop
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
- # Create shortcut for run App in Installer folder
+ # Create shortcut for run App in installer folder
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
@@ -139,7 +142,7 @@ jobs:
# Run app directly after installation
echo ' > streamlit_exe.wxs
echo ' ExeCommand="cmd.exe /c "[AppSubFolder]${{ env.APP_NAME }}.bat"" />' >> streamlit_exe.wxs
-
+
# Run Bat file during uninstallation
echo ' > streamlit_exe.wxs
echo ' ExeCommand="cmd.exe /c del /f /q [AppSubFolder]${{ env.APP_NAME }}.bat"" />' >> streamlit_exe.wxs
@@ -150,6 +153,8 @@ jobs:
echo ' NOT REMOVE' >> streamlit_exe.wxs
echo ' REMOVE="ALL"' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
+
+ # Interface options
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
echo ' ' >> streamlit_exe.wxs
@@ -160,14 +165,17 @@ jobs:
echo ' ' >> streamlit_exe.wxs
echo '' >> streamlit_exe.wxs
- - name: Build msi
+ - name: Build .wixobj file with candle.exe
run: |
./wix/candle.exe streamlit_exe.wxs streamlit_exe_files.wxs
+
+ - name: Link .wixobj file into .msi with light.exe
+ run: |
./wix/light.exe -ext WixUIExtension -sice:ICE60 -o ${{ env.APP_NAME }}.msi streamlit_exe_files.wixobj streamlit_exe.wixobj
-
+
- name: Archive build artifacts
uses: actions/upload-artifact@v4
with:
- name: ${{ env.APP_NAME }}
+ name: OpenMS-App-Test
path: |
- ${{ env.APP_NAME }}.msi
+ ${{ env.APP_NAME }}.msi
\ No newline at end of file