diff options
| author | j.spijker@ultimaker.com <jelle spijker> | 2022-07-14 10:18:37 +0300 |
|---|---|---|
| committer | Jelle Spijker <spijker.jelle@gmail.com> | 2022-07-14 10:18:37 +0300 |
| commit | b3cc3818b5b9b67a1d58a0495e096e415d8ac7ae (patch) | |
| tree | 989e7886cb968393d9ec107764821c40a7ecaa35 | |
| parent | 7dc378fb4c0f108e900fdd6e5ef7d6618c453d75 (diff) | |
various fixes to workflow
Contributes to CURA-9365
| -rw-r--r-- | .github/workflows/conan-package.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/conan-recipe-version.yml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index d9d2eaf4ef..a96afaedab 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -60,7 +60,7 @@ jobs: recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} runs_on: 'macos-10.15' - python_version: '3.10.4' + python_version: '3.10.x' conan_config_branch: 'master' conan_logging_level: 'info' conan_export_binaries: true @@ -74,7 +74,7 @@ jobs: recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} runs_on: 'ubuntu-20.04' - python_version: '3.10.4' + python_version: '3.10.x' conan_config_branch: 'master' conan_logging_level: 'info' conan_export_binaries: true @@ -88,7 +88,7 @@ jobs: recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} runs_on: 'windows-2022' - python_version: '3.10.4' + python_version: '3.10.x' conan_config_branch: 'master' conan_logging_level: 'info' conan_export_binaries: true @@ -96,7 +96,7 @@ jobs: notify-export: if: ${{ always() }} - needs: [ conan-package-export-linux, conan-package-export-macos, conan-package-export-windows ] + needs: [ conan-recipe-version, conan-package-export-linux, conan-package-export-macos, conan-package-export-windows ] uses: ultimaker/cura/.github/workflows/notify.yml@main with: diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 8e4e38553b..70f28b0290 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -76,7 +76,7 @@ jobs: # FIXME: for when we push a tag (such as an release) if is_tag: - branch_version = tools.Version("2.3.5") + branch_version = tools.Version("${{ github.ref_name }}") else: try: branch_version = tools.Version(repo.active_branch.name) |