From cb98990de7186a6fd86adeaa8c404a8780d0c0f6 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 14 Nov 2023 17:06:03 +0100 Subject: [PATCH] Use cura-workflows workflows for creating conan-package Contribute to CURA-10831 --- .github/workflows/conan-package.yml | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 5045075ba5..df1f7a46f4 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -51,7 +51,6 @@ on: - 'conandata.yml' - 'CMakeLists.txt' - '.github/workflows/conan-package.yml' - - '.github/worflows/requirements-conan-package.txt' branches: - main - 'CURA-*' @@ -77,44 +76,28 @@ jobs: secrets: inherit conan-package-create-macos: - if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || (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@main + uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-macos.yml@CURA-10831 with: project_name: ${{ needs.conan-recipe-version.outputs.project_name }} recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - build_id: 3 - runs_on: 'macos-11' - python_version: '3.11.x' - conan_logging_level: 'info' secrets: inherit conan-package-create-windows: - if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true' )) || (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@main + uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-windows.yml@CURA-10831 with: project_name: ${{ needs.conan-recipe-version.outputs.project_name }} recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - build_id: 4 - runs_on: 'windows-2022' - python_version: '3.11.x' - conan_config_branch: '' - conan_logging_level: 'info' secrets: inherit conan-package-create-linux: - if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || (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@main + uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-linux.yml@CURA-10831 with: project_name: ${{ needs.conan-recipe-version.outputs.project_name }} recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - build_id: 2 - runs_on: 'ubuntu-22.04' - python_version: '3.11.x' - conan_logging_level: 'info' secrets: inherit