|
20 | 20 | export DEBIAN_FRONTEND=noninteractive && apt-get install -y tzdata && |
21 | 21 | ln -fs /usr/share/zoneinfo/UTC /etc/localtime && |
22 | 22 | dpkg-reconfigure --frontend noninteractive tzdata && |
23 | | - apt-get install -y cmake qt5-default libeigen3-dev && |
| 23 | + apt-get install -y qt5-default libeigen3-dev && |
24 | 24 | apt-get install -y libboost-all-dev && |
25 | 25 | apt-get install -y libxerces-c-dev coinor-libcbc-dev libsvm-dev && |
26 | 26 | apt-get install -y libwildmagic-dev libsqlite3-dev && |
|
31 | 31 | apt-get install -y python3-sphinx python3-breathe python3-sphinx-rtd-theme sphinx-doc doxygen-latex doxygen-doc gsfonts graphviz-doc libgd-tools xapian-tools && |
32 | 32 | pip3 install exhale && |
33 | 33 | pip3 install -r tools/smartpeak/requirements.txt |
| 34 | + apt remove cmake |
| 35 | + pip3 install cmake --upgrade |
34 | 36 | - run: |
35 | 37 | # CircleCI doesn't support regex for conditional steps unfortunately... |
36 | 38 | # During the release workflow, the previous job will push version update commit to release branch. |
|
65 | 67 | command: | |
66 | 68 | mkdir ~/smartpeak_release_build |
67 | 69 | cd ~/smartpeak_release_build |
68 | | - cmake -DEIGEN_USE_GPU=OFF -DUSE_SUPERBUILD=OFF -G "Unix Makefiles" -DCMAKE_PREFIX_PATH=$HOME/OpenMS-build/ -DPLOG_INCLUDE_DIR=$HOME/SmartPeak/superbuild/Dependencies/Source/plog/include -DIMGUI_DIR=$HOME/SmartPeak/superbuild/Dependencies/Source/imgui -DIMPLOT_DIR=$HOME/SmartPeak/superbuild/Dependencies/Source/implot -DPORTABLEFILEDIALOGS_DIR=$HOME/SmartPeak/superbuild/Dependencies/Source/portablefiledialogs -DCMAKE_BUILD_TYPE=Release ~/SmartPeak |
| 70 | + cmake -DEIGEN_USE_GPU=OFF -DUSE_SUPERBUILD=OFF -G "Unix Makefiles" -DCMAKE_PREFIX_PATH=$HOME/OpenMS-build/ -D=OpenMS_DIR=$HOME/OpenMS -DPLOG_INCLUDE_DIR=$HOME/SmartPeak/superbuild/Dependencies/Source/plog/include -DIMGUI_DIR=$HOME/SmartPeak/superbuild/Dependencies/Source/imgui -DIMPLOT_DIR=$HOME/SmartPeak/superbuild/Dependencies/Source/implot -DPORTABLEFILEDIALOGS_DIR=$HOME/SmartPeak/superbuild/Dependencies/Source/portablefiledialogs -DCMAKE_BUILD_TYPE=Release ~/SmartPeak |
69 | 71 | make -j4 |
70 | 72 | - run: |
71 | 73 | name: Running SmartPeak Class Tests |
@@ -211,7 +213,7 @@ jobs: |
211 | 213 | [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 |
212 | 214 | $ProgressPreference = "SilentlyContinue" |
213 | 215 | Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) |
214 | | - choco install cmake --version=3.17.2 --installargs '"ADD_CMAKE_TO_PATH=System"' |
| 216 | + choco install cmake --version=3.21.0 --installargs '"ADD_CMAKE_TO_PATH=System"' |
215 | 217 | choco install gnuplot.portable |
216 | 218 | choco install doxygen.install |
217 | 219 | choco install nsis.portable |
@@ -300,16 +302,16 @@ jobs: |
300 | 302 | $env:PYTHONPATH = $PWD.Path + "\tools" |
301 | 303 | python -m unittest discover -s .\tools\smartpeak\ |
302 | 304 | ThrowOnFailure "Python tests failed!" |
303 | | - - run: |
304 | | - name: Signing SmartPeak with trusted certificate |
305 | | - command: | |
306 | | - $ErrorActionPreference = "Stop" |
307 | | - cd ~/SmartPeak/smartpeak_release_build |
308 | | - git clone --branch main https://github.com/AutoFlowResearch/CodeSigning |
309 | | - Import-Module .\CodeSigning\CertCrypto.psm1 |
310 | | - Unprotect-Cert '.\CodeSigning\CodeSigning_DTU_AIT_KIT_DTUDOC.pfx.AES' -KeyAsPlainText $env:PFX_AES -RemoveSource |
311 | | - certutil -p $env:PFX_PSWD -importpfx .\CodeSigning\CodeSigning_DTU_AIT_KIT_DTUDOC.pfx |
312 | | - & 'C:\Program Files (x86)\windows kits\10\bin\x64\signtool.exe' sign /v /sm /s My /n "DTU-AIT-DTUDOC client Plugin" *.exe |
| 305 | +# - run: |
| 306 | +# name: Signing SmartPeak with trusted certificate |
| 307 | +# command: | |
| 308 | +# $ErrorActionPreference = "Stop" |
| 309 | +# cd ~/SmartPeak/smartpeak_release_build |
| 310 | +# git clone --branch main https://github.com/AutoFlowResearch/CodeSigning |
| 311 | +# Import-Module .\CodeSigning\CertCrypto.psm1 |
| 312 | +# Unprotect-Cert '.\CodeSigning\CodeSigning_DTU_AIT_KIT_DTUDOC.pfx.AES' -KeyAsPlainText $env:PFX_AES -RemoveSource |
| 313 | +# certutil -p $env:PFX_PSWD -importpfx .\CodeSigning\CodeSigning_DTU_AIT_KIT_DTUDOC.pfx |
| 314 | +# & 'C:\Program Files (x86)\windows kits\10\bin\x64\signtool.exe' sign /v /sm /s My /n "DTU-AIT-DTUDOC client Plugin" *.exe |
313 | 315 | - run: |
314 | 316 | name: Preparing Artifact |
315 | 317 | command: | |
|
0 commit comments