Skip to content

Commit 6556418

Browse files
Feat/wizard (#553)
* Introducing PresetWorkflow class * Upgrade Cmake versions * Removed certificate signature * Update statistics only on user changes Co-authored-by: dmccloskey <[email protected]>
1 parent 79f7e12 commit 6556418

32 files changed

+19970
-306
lines changed

.circleci/config.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
export DEBIAN_FRONTEND=noninteractive && apt-get install -y tzdata &&
2121
ln -fs /usr/share/zoneinfo/UTC /etc/localtime &&
2222
dpkg-reconfigure --frontend noninteractive tzdata &&
23-
apt-get install -y cmake qt5-default libeigen3-dev &&
23+
apt-get install -y qt5-default libeigen3-dev &&
2424
apt-get install -y libboost-all-dev &&
2525
apt-get install -y libxerces-c-dev coinor-libcbc-dev libsvm-dev &&
2626
apt-get install -y libwildmagic-dev libsqlite3-dev &&
@@ -31,6 +31,8 @@ jobs:
3131
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 &&
3232
pip3 install exhale &&
3333
pip3 install -r tools/smartpeak/requirements.txt
34+
apt remove cmake
35+
pip3 install cmake --upgrade
3436
- run:
3537
# CircleCI doesn't support regex for conditional steps unfortunately...
3638
# During the release workflow, the previous job will push version update commit to release branch.
@@ -65,7 +67,7 @@ jobs:
6567
command: |
6668
mkdir ~/smartpeak_release_build
6769
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
6971
make -j4
7072
- run:
7173
name: Running SmartPeak Class Tests
@@ -211,7 +213,7 @@ jobs:
211213
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
212214
$ProgressPreference = "SilentlyContinue"
213215
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"'
215217
choco install gnuplot.portable
216218
choco install doxygen.install
217219
choco install nsis.portable
@@ -300,16 +302,16 @@ jobs:
300302
$env:PYTHONPATH = $PWD.Path + "\tools"
301303
python -m unittest discover -s .\tools\smartpeak\
302304
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
313315
- run:
314316
name: Preparing Artifact
315317
command: |

0 commit comments

Comments
 (0)