diff --git a/.github/workflows/build-windows-executable-app.yaml b/.github/workflows/build-windows-executable-app.yaml index 9df7e5fb..ebc68faf 100644 --- a/.github/workflows/build-windows-executable-app.yaml +++ b/.github/workflows/build-windows-executable-app.yaml @@ -14,7 +14,7 @@ env: OPENMS_VERSION: 3.2.0 PYTHON_VERSION: 3.11.0 # Name of the installer - APP_NAME: FLASHApp-0.9.2 + APP_NAME: FLASHApp-0.9.4 APP_UpgradeCode: "69ae44ad-d554-4e3c-8715-7c4daf60f8bb" jobs: @@ -174,10 +174,10 @@ jobs: WITH_GUI: "OFF" ADDRESS_SANITIZER: "Off" BUILD_TYPE: "Release" - OPENMP: "Off" + OPENMP: "On" USE_STATIC_BOOST: "On" # BUILD_FLAGS: "-p:CL_MPCount=2" # For VS Generator and MSBuild - BUILD_FLAGS: "-j2" # Ninja will otherwise use all cores (doesn't go well in GHA) + BUILD_FLAGS: "-j4" # Ninja will otherwise use all cores (doesn't go well in GHA) CMAKE_CCACHE_EXE: "ccache" CCACHE_BASEDIR: ${{ github.workspace }} CCACHE_DIR: ${{ github.workspace }}/.ccache diff --git a/Dockerfile b/Dockerfile index 362d4592..bdaa047b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -103,7 +103,7 @@ RUN mkdir /openms-build WORKDIR /openms-build # Configure. -RUN /bin/bash -c "cmake -DCMAKE_BUILD_TYPE='Release' -DCMAKE_PREFIX_PATH='/OpenMS/contrib-build/;/usr/;/usr/local' -DHAS_XSERVER=OFF -DBOOST_USE_STATIC=OFF -DPYOPENMS=ON ../OpenMS -DPY_MEMLEAK_DISABLE=On" +RUN /bin/bash -c "cmake -DCMAKE_BUILD_TYPE='Release' -DCMAKE_PREFIX_PATH='/OpenMS/contrib-build/;/usr/;/usr/local' -DHAS_XSERVER=OFF -DBOOST_USE_STATIC=OFF -DPYOPENMS=ON ../OpenMS -DPY_MEMLEAK_DISABLE=On DOPENMP=ON" # Build TOPP tools and clean up. RUN make -j4 TOPP diff --git a/settings.json b/settings.json index fdb028a4..b1da5790 100644 --- a/settings.json +++ b/settings.json @@ -1,7 +1,7 @@ { "app-name": "FLASHApp", "github-user": "OpenMS", - "version": "0.9.2", + "version": "0.9.4", "repository-name": "FLASHApp", "analytics": { "google-analytics": {