From fd8e229753cae5380a2650528273df9e491f6fc8 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 18 Sep 2024 09:15:44 +0200 Subject: [PATCH] Use common workflow --- .github/workflows/conan-package.yml | 54 +---------------------- .github/workflows/requirements-runner.txt | 0 2 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 .github/workflows/requirements-runner.txt diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index d03c284..3672ae8 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -20,58 +20,8 @@ on: jobs: # FIXME: Use main once merged - conan-recipe-version: - uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@CURA-11622_conan_v2 + conan-package: + uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 with: project_name: pynest2d - -# FIXME: Use main once merged - conan-package-export: - needs: [ conan-recipe-version ] - uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@CURA-11622_conan_v2 - with: - recipe_id_name: ${{ needs.conan-recipe-version.outputs.project_name }} - recipe_id_version: ${{ needs.conan-recipe-version.outputs.recipe_semver_full }} - recipe_id_user: ${{ needs.conan-recipe-version.outputs.user }} - recipe_id_channel: ${{ needs.conan-recipe-version.outputs.channel }} - recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - secrets: inherit - -# FIXME: Use main once merged - conan-package-create-macos: - needs: [ conan-recipe-version, conan-package-export ] - if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) }} - uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-macos.yml@CURA-11622_conan_v2 - with: - recipe_id_name: ${{ needs.conan-recipe-version.outputs.project_name }} - recipe_id_version: ${{ needs.conan-recipe-version.outputs.recipe_semver_full }} - recipe_id_user: ${{ needs.conan-recipe-version.outputs.user }} - recipe_id_channel: ${{ needs.conan-recipe-version.outputs.channel }} - recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} secrets: inherit - -# FIXME: Use main once merged - conan-package-create-windows: - needs: [ conan-recipe-version, conan-package-export ] - if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) }} - uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-windows.yml@CURA-11622_conan_v2 - with: - recipe_id_name: ${{ needs.conan-recipe-version.outputs.project_name }} - recipe_id_version: ${{ needs.conan-recipe-version.outputs.recipe_semver_full }} - recipe_id_user: ${{ needs.conan-recipe-version.outputs.user }} - recipe_id_channel: ${{ needs.conan-recipe-version.outputs.channel }} - recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - secrets: inherit - -# FIXME: Use main once merged - conan-package-create-linux: - needs: [ conan-recipe-version, conan-package-export ] - if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) }} - uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-linux.yml@CURA-11622_conan_v2 - with: - recipe_id_name: ${{ needs.conan-recipe-version.outputs.project_name }} - recipe_id_version: ${{ needs.conan-recipe-version.outputs.recipe_semver_full }} - recipe_id_user: ${{ needs.conan-recipe-version.outputs.user }} - recipe_id_channel: ${{ needs.conan-recipe-version.outputs.channel }} - recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - secrets: inherit \ No newline at end of file diff --git a/.github/workflows/requirements-runner.txt b/.github/workflows/requirements-runner.txt deleted file mode 100644 index e69de29..0000000