From f62104aa844538d2b6f46590f9163846a841b7e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20=C5=A0ach?= Date: Thu, 21 Nov 2024 14:57:16 +0100 Subject: [PATCH] Refactor workflows to allow conditionals --- .github/workflows/build.yml | 40 ----------------------------- .github/workflows/build_flatpak.yml | 20 +++++++++++++++ .github/workflows/build_osx.yml | 20 +++++++++++++++ .github/workflows/build_windows.yml | 23 +++++++++++++++++ CMakeLists.txt | 1 - 5 files changed, 63 insertions(+), 41 deletions(-) delete mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/build_flatpak.yml create mode 100644 .github/workflows/build_osx.yml create mode 100644 .github/workflows/build_windows.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 0bfc69d08e..0000000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Build - -on: - push: - workflow_dispatch: - -jobs: - build_osx: - uses: Prusa-Development/PrusaSlicer-Actions/.github/workflows/build_osx.yml@master - secrets: inherit - with: - actions_branch: master - - build_osx_asan: - uses: Prusa-Development/PrusaSlicer-Actions/.github/workflows/build_osx.yml@master - secrets: inherit - needs: build_osx - with: - with_asan: true - actions_branch: master - - build_win: - uses: Prusa-Development/PrusaSlicer-Actions/.github/workflows/build_windows.yml@master - secrets: inherit - with: - actions_branch: master - - build_flatpak: - uses: Prusa-Development/PrusaSlicer-Actions/.github/workflows/build_flatpak.yml@master - secrets: inherit - with: - actions_branch: master - - build_flatpak_asan: - uses: Prusa-Development/PrusaSlicer-Actions/.github/workflows/build_flatpak.yml@master - secrets: inherit - needs: build_flatpak - with: - with_asan: true - actions_branch: master diff --git a/.github/workflows/build_flatpak.yml b/.github/workflows/build_flatpak.yml new file mode 100644 index 0000000000..a4c80e2b73 --- /dev/null +++ b/.github/workflows/build_flatpak.yml @@ -0,0 +1,20 @@ +name: Build flatpak + +on: + push: + workflow_dispatch: + +jobs: + build_flatpak: + uses: Prusa-Development/PrusaSlicer-Actions/.github/workflows/build_flatpak.yml@master + secrets: inherit + with: + actions_branch: master + + build_flatpak_asan: + uses: Prusa-Development/PrusaSlicer-Actions/.github/workflows/build_flatpak.yml@master + secrets: inherit + needs: build_flatpak + with: + with_asan: true + actions_branch: master diff --git a/.github/workflows/build_osx.yml b/.github/workflows/build_osx.yml new file mode 100644 index 0000000000..f03f78d4c1 --- /dev/null +++ b/.github/workflows/build_osx.yml @@ -0,0 +1,20 @@ +name: Build osx + +on: + push: + workflow_dispatch: + +jobs: + build_osx: + uses: Prusa-Development/PrusaSlicer-Actions/.github/workflows/build_osx.yml@master + secrets: inherit + with: + actions_branch: master + + build_osx_asan: + uses: Prusa-Development/PrusaSlicer-Actions/.github/workflows/build_osx.yml@master + secrets: inherit + needs: build_osx + with: + with_asan: true + actions_branch: master diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml new file mode 100644 index 0000000000..4f737d41dd --- /dev/null +++ b/.github/workflows/build_windows.yml @@ -0,0 +1,23 @@ +name: Build windows + +on: + push: + workflow_dispatch: + inputs: + create_pdb: + description: 'Zip pdbs' + default: false + type: bool + create_installer: + description: 'Create installer' + default: false + type: bool + +jobs: + build_win: + uses: Prusa-Development/PrusaSlicer-Actions/.github/workflows/build_windows.yml@master + secrets: inherit + with: + actions_branch: master + create_pdb: ${{ inputs.create_pdb }} + create_installer: ${{ inputs.create_installer }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 31cb4c0ff3..5f74e102ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,6 @@ option(SLIC3R_GUI "Compile PrusaSlicer with GUI components (OpenGL, wxWidg option(SLIC3R_FHS "Assume PrusaSlicer is to be installed in a FHS directory structure" 0) option(SLIC3R_PCH "Use precompiled headers" 1) option(SLIC3R_MSVC_COMPILE_PARALLEL "Compile on Visual Studio in parallel" 1) -option(SLIC3R_MSVC_PDB "Generate PDB files on MSVC in Release mode" 1) option(SLIC3R_ASAN "Enable ASan on Clang and GCC" 0) option(SLIC3R_UBSAN "Enable UBSan on Clang and GCC" 0) option(SLIC3R_ENABLE_FORMAT_STEP "Enable compilation of STEP file support" ON)