From 771a35a51cc19a8fa9b627a62f3f79de5d35440b Mon Sep 17 00:00:00 2001 From: Tom David Mueller Date: Fri, 19 Sep 2025 19:44:14 +0200 Subject: [PATCH 1/8] switch to powershell --- .github/workflows/build-windows-executable-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-windows-executable-app.yaml b/.github/workflows/build-windows-executable-app.yaml index 1eb77cc..da5e3af 100644 --- a/.github/workflows/build-windows-executable-app.yaml +++ b/.github/workflows/build-windows-executable-app.yaml @@ -88,7 +88,7 @@ jobs: arch: x64 - name: Setup build tools - shell: bash + shell: powershell run: | choco install ccache ninja -y --no-progress choco install cmake --version=3.31.1 -y --no-progress --force From 0b48c5452556ebeeb40f874cb6c3bdd8a32160a4 Mon Sep 17 00:00:00 2001 From: Tom David Mueller Date: Sun, 21 Sep 2025 18:20:18 +0200 Subject: [PATCH 2/8] Revert "bump version" This reverts commit 116a48179471a0c4be4973a2b43a4c9f3b215aa9. --- .github/workflows/build-windows-executable-app.yaml | 2 +- settings.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-windows-executable-app.yaml b/.github/workflows/build-windows-executable-app.yaml index da5e3af..c8865eb 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.12 + APP_NAME: FLASHApp-0.9.11 APP_UpgradeCode: "69ae44ad-d554-4e3c-8715-7c4daf60f8bb" jobs: diff --git a/settings.json b/settings.json index f0c96e9..7961b61 100644 --- a/settings.json +++ b/settings.json @@ -1,7 +1,7 @@ { "app-name": "FLASHApp", "github-user": "OpenMS", - "version": "0.9.12", + "version": "0.9.11", "repository-name": "FLASHApp", "analytics": { "google-analytics": { From 8457b529d8f671c887bc42b4321707f3143acfeb Mon Sep 17 00:00:00 2001 From: Tom David Mueller Date: Sun, 21 Sep 2025 18:20:26 +0200 Subject: [PATCH 3/8] Reapply "bump version" This reverts commit 0b48c5452556ebeeb40f874cb6c3bdd8a32160a4. --- .github/workflows/build-windows-executable-app.yaml | 2 +- settings.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-windows-executable-app.yaml b/.github/workflows/build-windows-executable-app.yaml index c8865eb..da5e3af 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.11 + APP_NAME: FLASHApp-0.9.12 APP_UpgradeCode: "69ae44ad-d554-4e3c-8715-7c4daf60f8bb" jobs: diff --git a/settings.json b/settings.json index 7961b61..f0c96e9 100644 --- a/settings.json +++ b/settings.json @@ -1,7 +1,7 @@ { "app-name": "FLASHApp", "github-user": "OpenMS", - "version": "0.9.11", + "version": "0.9.12", "repository-name": "FLASHApp", "analytics": { "google-analytics": { From b508171f4d2dbb13469ac170cf784edc9c7201c0 Mon Sep 17 00:00:00 2001 From: Tom David Mueller Date: Sun, 21 Sep 2025 18:20:43 +0200 Subject: [PATCH 4/8] Revert "switch to powershell" This reverts commit 771a35a51cc19a8fa9b627a62f3f79de5d35440b. --- .github/workflows/build-windows-executable-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-windows-executable-app.yaml b/.github/workflows/build-windows-executable-app.yaml index da5e3af..1eb77cc 100644 --- a/.github/workflows/build-windows-executable-app.yaml +++ b/.github/workflows/build-windows-executable-app.yaml @@ -88,7 +88,7 @@ jobs: arch: x64 - name: Setup build tools - shell: powershell + shell: bash run: | choco install ccache ninja -y --no-progress choco install cmake --version=3.31.1 -y --no-progress --force From 6d7cef8c103156c7d806b3ae7030321004b21a67 Mon Sep 17 00:00:00 2001 From: Tom David Mueller Date: Sun, 21 Sep 2025 18:22:35 +0200 Subject: [PATCH 5/8] add debug handling for "build" failure --- .../build-windows-executable-app.yaml | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-windows-executable-app.yaml b/.github/workflows/build-windows-executable-app.yaml index 1eb77cc..726f5e8 100644 --- a/.github/workflows/build-windows-executable-app.yaml +++ b/.github/workflows/build-windows-executable-app.yaml @@ -159,8 +159,26 @@ jobs: - name: Build Windows shell: bash run: | - mkdir $GITHUB_WORKSPACE/OpenMS/bld/ - ctest --output-on-failure -V -S $GITHUB_WORKSPACE/OpenMS/tools/ci/cibuild.cmake + # Ensure cmake/ctest and choco tools are visible in bash + export PATH="/c/Program Files/CMake/bin:/c/ProgramData/chocolatey/bin:$PATH" + + mkdir -p "$GITHUB_WORKSPACE/OpenMS/bld/" + # Print paths for debugging (somehting here frequently fails due to changes in runners) + which cmake || true + which ctest || true + which ninja || true + which ccache || true + + # Give CMake the absolute ccache path to avoid lookup glitches + export CMAKE_CCACHE_EXE="C:/ProgramData/chocolatey/bin/ccache.exe" + + # Run the dashboard but don't fail the step on a spurious 127 + ctest --output-on-failure -V -S "$GITHUB_WORKSPACE/OpenMS/tools/ci/cibuild.cmake" || { + status=$? + echo "ctest exited with $status (treating as soft failure because dashboard already uploaded)." + # Treat only 'command not found' (127) as ignorable; rethrow others + if [ "$status" -ne 127 ]; then exit "$status"; fi + } env: #OS_PREFIX_PATH: "${{ env.Qt5_DIR }}/lib/cmake;${{ env.Qt5_DIR }}" OPENMS_CONTRIB_LIBS: "${{ github.workspace }}/OpenMS/contrib" From de3116bd3389578a10634d93791c158321206809 Mon Sep 17 00:00:00 2001 From: Tom David Mueller Date: Mon, 22 Sep 2025 07:14:01 +0200 Subject: [PATCH 6/8] use current build script --- .github/workflows/build-windows-executable-app.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/build-windows-executable-app.yaml b/.github/workflows/build-windows-executable-app.yaml index 726f5e8..2dee670 100644 --- a/.github/workflows/build-windows-executable-app.yaml +++ b/.github/workflows/build-windows-executable-app.yaml @@ -59,17 +59,6 @@ jobs: repository: t0mdavid-m/OpenMS ref: FVdeploy path: 'OpenMS' - - # Temporary fix - until seqan is back online or new OpenMS release (3.4) - - name: Get latest cibuild.cmake - working-directory: OpenMS - run: | - git config user.name "GitHub Actions" - git config user.email "actions@github.com" - git fetch origin develop - git checkout origin/develop -- tools/ci/cibuild.cmake - git checkout origin/develop -- tools/ci/citest.cmake - git checkout origin/develop -- tools/ci/cipackage.cmake - name: Install Qt uses: jurplel/install-qt-action@v3 From 92a6b258a979e83090248496f8680f7e5fcce824 Mon Sep 17 00:00:00 2001 From: Tom David Mueller Date: Mon, 22 Sep 2025 09:12:41 +0200 Subject: [PATCH 7/8] use windows 2022 --- .github/workflows/build-windows-executable-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-windows-executable-app.yaml b/.github/workflows/build-windows-executable-app.yaml index 2dee670..494ef1d 100644 --- a/.github/workflows/build-windows-executable-app.yaml +++ b/.github/workflows/build-windows-executable-app.yaml @@ -50,7 +50,7 @@ jobs: path: openms-streamlit-vue-component/dist build-openms: - runs-on: windows-latest + runs-on: windows-2022 steps: - name: Checkout From 6d3772ecbce22a23fc3135954f2734462b46be3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20David=20M=C3=BCller?= <57191390+t0mdavid-m@users.noreply.github.com> Date: Mon, 22 Sep 2025 10:43:53 +0200 Subject: [PATCH 8/8] make windows build consistent,remove debug --- .../build-windows-executable-app.yaml | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-windows-executable-app.yaml b/.github/workflows/build-windows-executable-app.yaml index 494ef1d..98a7438 100644 --- a/.github/workflows/build-windows-executable-app.yaml +++ b/.github/workflows/build-windows-executable-app.yaml @@ -59,7 +59,7 @@ jobs: repository: t0mdavid-m/OpenMS ref: FVdeploy path: 'OpenMS' - + - name: Install Qt uses: jurplel/install-qt-action@v3 with: @@ -148,26 +148,8 @@ jobs: - name: Build Windows shell: bash run: | - # Ensure cmake/ctest and choco tools are visible in bash - export PATH="/c/Program Files/CMake/bin:/c/ProgramData/chocolatey/bin:$PATH" - - mkdir -p "$GITHUB_WORKSPACE/OpenMS/bld/" - # Print paths for debugging (somehting here frequently fails due to changes in runners) - which cmake || true - which ctest || true - which ninja || true - which ccache || true - - # Give CMake the absolute ccache path to avoid lookup glitches - export CMAKE_CCACHE_EXE="C:/ProgramData/chocolatey/bin/ccache.exe" - - # Run the dashboard but don't fail the step on a spurious 127 - ctest --output-on-failure -V -S "$GITHUB_WORKSPACE/OpenMS/tools/ci/cibuild.cmake" || { - status=$? - echo "ctest exited with $status (treating as soft failure because dashboard already uploaded)." - # Treat only 'command not found' (127) as ignorable; rethrow others - if [ "$status" -ne 127 ]; then exit "$status"; fi - } + mkdir $GITHUB_WORKSPACE/OpenMS/bld/ + ctest --output-on-failure -V -S $GITHUB_WORKSPACE/OpenMS/tools/ci/cibuild.cmake env: #OS_PREFIX_PATH: "${{ env.Qt5_DIR }}/lib/cmake;${{ env.Qt5_DIR }}" OPENMS_CONTRIB_LIBS: "${{ github.workspace }}/OpenMS/contrib" @@ -219,7 +201,7 @@ jobs: path: ${{ github.workspace }}/OpenMS/bld/*.zip build-executable: - runs-on: windows-latest + runs-on: windows-2022 needs: [build-openms, build-vue-js-component] steps: