From f58389d59914aa406b698937c1be99a89e3301b4 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Thu, 23 Jun 2022 09:27:34 +0200 Subject: [PATCH] Build on the current branch for testing purposes Contributes to CURA-9365 --- .github/workflows/conan-package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 569b74b21f..4c9f730335 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -64,7 +64,7 @@ jobs: conan-package-create-macos: # FIXME: For release branches: maybe rename the branch to release/** - if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == '5.1')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_macos) }} + if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == '5.1' || github.ref_name == 'CURA-9365_fix_building_cura_main' )) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_macos) }} needs: [ conan-recipe-version, conan-package-export ] uses: ultimaker/cura/.github/workflows/conan-package-create.yml@CURA-9365_fix_building_cura_main @@ -78,7 +78,7 @@ jobs: conan-package-create-windows: # FIXME: For release branches: maybe rename the branch to release/** - if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == '5.1')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_windows) }} + if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == '5.1' || github.ref_name == 'CURA-9365_fix_building_cura_main' )) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_windows) }} needs: [ conan-recipe-version, conan-package-export ] uses: ultimaker/cura/.github/workflows/conan-package-create.yml@CURA-9365_fix_building_cura_main @@ -92,7 +92,7 @@ jobs: conan-package-create-linux: # FIXME: For release branches: maybe rename the branch to release/** - if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == '5.1')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_linux) }} + if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == '5.1' || github.ref_name == 'CURA-9365_fix_building_cura_main')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_linux) }} needs: [ conan-recipe-version, conan-package-export ] uses: ultimaker/cura/.github/workflows/conan-package-create.yml@CURA-9365_fix_building_cura_main