Skip to content

Commit f2ad2b1

Browse files
authored
Fix Builds for OpenMS 3.5 (#299)
* remove temp fix * add contrib libs the CMakeCache.txt * switch to 3.5.0 * fix windows * thirdparty is x86_64 now * remove restrictions for cython and autowrap * disable parquet support * add contrib libraries to path * remove deprecated pyinstaller * set openms share path
1 parent 8b681f6 commit f2ad2b1

File tree

3 files changed

+20
-315
lines changed

3 files changed

+20
-315
lines changed

.github/workflows/build-windows-executable-app-with-pyinstaller.yaml

Lines changed: 0 additions & 292 deletions
This file was deleted.

.github/workflows/build-windows-executable-app.yaml

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313
contents: write
1414

1515
env:
16-
OPENMS_VERSION: 3.2.0
16+
OPENMS_VERSION: 3.5.0
1717
PYTHON_VERSION: 3.11.0
1818
# Name of the installer
1919
APP_NAME: OpenMS-StreamlitTemplateApp
@@ -33,27 +33,14 @@ jobs:
3333
repository: OpenMS/OpenMS
3434
ref: release/${{ env.OPENMS_VERSION }}
3535
path: 'OpenMS'
36-
37-
# Temporary fix - until seqan is back online or new OpenMS release (3.4)
38-
- name: Get latest cibuild.cmake
39-
working-directory: OpenMS
40-
run: |
41-
git config user.name "GitHub Actions"
42-
git config user.email "actions@github.com"
43-
git fetch origin develop
44-
git checkout origin/develop -- tools/ci/cibuild.cmake
45-
git checkout origin/develop -- tools/ci/citest.cmake
46-
git checkout origin/develop -- tools/ci/cipackage.cmake
47-
48-
- name: Install Qt
36+
37+
- name: Install Qt (Windows)
4938
uses: jurplel/install-qt-action@v4
5039
with:
51-
version: '5.15.2' # 5.12.7 is broken https://bugreports.qt.io/browse/QTBUG-81715, > 5.15.2 is not available on official archives (https://github.com/miurahr/aqtinstall/issues/636)
52-
host: 'windows' # default: win64_msvc2017_64
53-
target: 'desktop'
54-
install-deps: 'true'
40+
version: '6.8.3' ## Note this version is build with win64_msvc2022_64 and should always match what we use
41+
arch: 'win64_msvc2022_64'
5542
cache: 'false'
56-
aqtversion: '==3.1.*'
43+
archives: 'qtsvg qtimageformats qtbase'
5744

5845
# https://github.com/marketplace/actions/visual-studio-shell
5946
- name: Set up Visual Studio shell
@@ -101,6 +88,12 @@ jobs:
10188
rm contrib_build-Windows.tar.gz
10289
ls
10390
91+
- name: Add contrib to PATH
92+
shell: bash
93+
run: |
94+
# Add contrib library path for runtime DLL resolution
95+
echo "${{ github.workspace }}/OpenMS/contrib/lib" >> $GITHUB_PATH
96+
10497
- name: Setup ccache cache
10598
uses: actions/cache@v4
10699
with:
@@ -122,7 +115,7 @@ jobs:
122115
# add third-party binaries to PATH
123116
# use flat THIRDPARTY structure
124117
mkdir -p _thirdparty
125-
cp -R OpenMS/THIRDPARTY/Windows/64bit/* _thirdparty/
118+
cp -R OpenMS/THIRDPARTY/Windows/x86_64/* _thirdparty/
126119
cp -R OpenMS/THIRDPARTY/All/* _thirdparty/
127120
# add third-party binaries to PATH
128121
for thirdpartytool in ${{ github.workspace }}/_thirdparty/*
@@ -134,9 +127,9 @@ jobs:
134127
shell: bash
135128
run: |
136129
mkdir $GITHUB_WORKSPACE/OpenMS/bld/
130+
bash OpenMS/tools/ci/capture-env.sh -v $GITHUB_WORKSPACE/OpenMS/bld/CMakeCache.txt
137131
ctest --output-on-failure -V -S $GITHUB_WORKSPACE/OpenMS/tools/ci/cibuild.cmake
138132
env:
139-
#OS_PREFIX_PATH: "${{ env.Qt5_DIR }}/lib/cmake;${{ env.Qt5_DIR }}"
140133
OPENMS_CONTRIB_LIBS: "${{ github.workspace }}/OpenMS/contrib"
141134
CI_PROVIDER: "GitHub-Actions"
142135
CMAKE_GENERATOR: "Ninja"
@@ -146,6 +139,7 @@ jobs:
146139
ENABLE_TOPP_TESTING: "ON"
147140
ENABLE_CLASS_TESTING: "ON"
148141
WITH_GUI: "OFF"
142+
WITH_PARQUET: "OFF"
149143
ADDRESS_SANITIZER: "Off"
150144
BUILD_TYPE: "Release"
151145
OPENMP: "Off"
@@ -264,6 +258,9 @@ jobs:
264258
run: |
265259
echo '@echo off' > ${{ env.APP_NAME }}.bat
266260
echo '' >> ${{ env.APP_NAME }}.bat
261+
echo 'REM Set OpenMS data path for TOPP tools' >> ${{ env.APP_NAME }}.bat
262+
echo 'set OPENMS_DATA_PATH=%~dp0share\OpenMS' >> ${{ env.APP_NAME }}.bat
263+
echo '' >> ${{ env.APP_NAME }}.bat
267264
echo 'REM Create .streamlit directory in user''s home if it doesn''t exist' >> ${{ env.APP_NAME }}.bat
268265
echo 'if not exist "%USERPROFILE%\.streamlit" mkdir "%USERPROFILE%\.streamlit"' >> ${{ env.APP_NAME }}.bat
269266
echo '' >> ${{ env.APP_NAME }}.bat

0 commit comments

Comments
 (0)