diff options
| author | j.spijker@ultimaker.com <jelle spijker> | 2022-07-14 10:12:51 +0300 |
|---|---|---|
| committer | Jelle Spijker <spijker.jelle@gmail.com> | 2022-07-14 10:12:51 +0300 |
| commit | 62ea4f3a4851099620119ad10a4ea06ba1b74106 (patch) | |
| tree | 98cb414777f2b51c1f07f3522286848c6772b4da /.github | |
| parent | 13167bf30beab886de4659cf5c3329acf49c46e9 (diff) | |
Updated branches in workflows
Contributes to CURA-9365
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/conan-package.yml | 18 | ||||
| -rw-r--r-- | .github/workflows/cura-installer.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/unit-test.yml | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index c2eab5c632..2c8de838fd 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -48,19 +48,19 @@ on: jobs: conan-recipe-version: - uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@CURA-9365 + uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main with: project_name: cura conan-package-export-macos: needs: [ conan-recipe-version ] - uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@5.1 + uses: ultimaker/cura/.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 }} 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 @@ -68,13 +68,13 @@ jobs: conan-package-export-linux: needs: [ conan-recipe-version ] - uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@5.1 + uses: ultimaker/cura/.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 }} 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 @@ -82,13 +82,13 @@ jobs: conan-package-export-windows: needs: [ conan-recipe-version ] - uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@5.1 + uses: ultimaker/cura/.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 }} 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,9 +96,9 @@ 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@5.1 + uses: ultimaker/cura/.github/workflows/notify.yml@main with: success: ${{ contains(join(needs.*.result, ','), 'success') }} success_title: "New Conan recipe exported in ${{ github.repository }}" diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 51c6a4cd9c..46909bfe47 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -6,7 +6,7 @@ on: cura_conan_version: description: 'Cura Conan Version' # Fixme: default to cura/latest@testing (which is main) - default: 'cura/latest@ultimaker/stable' + default: 'cura/latest@ultimaker/main' required: true conan_config: description: 'Conan config branch to use' diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index bbdc521aa4..3c950671c4 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -62,7 +62,7 @@ env: jobs: conan-recipe-version: - uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@CURA-9365 + uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main with: project_name: cura |