Skip to content

Commit

Permalink
Use common workflows and remove obsolete ones
Browse files Browse the repository at this point in the history
  • Loading branch information
wawanbreton committed Sep 18, 2024
1 parent 1117311 commit cc214a5
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 91 deletions.
51 changes: 0 additions & 51 deletions .github/workflows/build.yml

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: CI/CD
on: [push, pull_request]
jobs:
Expand All @@ -8,7 +7,7 @@ jobs:
container: python:3.7-slim
steps:
- name: Checkout master
uses: actions/checkout@v1.2.0
uses: actions/checkout@v4
- name: Install lxml
run: python -m pip install lxml==4.6.5
- name:
Expand Down
17 changes: 7 additions & 10 deletions .github/workflows/conan-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,18 @@ on:
branches:
- main
- master
- 'PP-*'
- 'CURA-*'
- 'PP-*'
- 'NP-*'
- '[0-9].[0-9]*'
- '[0-9].[0-9][0-9]*'

jobs:
conan-recipe-version:
uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main
# FIXME: Use main once merged
conan-package:
uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2
with:
project_name: fdm_materials

conan-package-export-linux:
needs: [ conan-recipe-version ]
uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@main
with:
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
platform_windows: false
platform_mac: false
secrets: inherit
27 changes: 0 additions & 27 deletions .github/workflows/notify_on_print_profile_change.yml

This file was deleted.

1 change: 0 additions & 1 deletion .github/workflows/requirements-conan-package.txt

This file was deleted.

0 comments on commit cc214a5

Please sign in to comment.