diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 12567fde84..7ca2b0c467 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -31,16 +31,15 @@ env: CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} CONAN_PASSWORD_CURA: ${{ secrets.CONAN_PASS }} -# FIXME: point to `main` once merged jobs: conan-recipe-version: - uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@CURA-10831 + uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main with: project_name: cura conan-package-export: needs: [ conan-recipe-version ] - uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@CURA-10831 + 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 }} diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index aa1f5a49f0..6e531ba833 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -42,16 +42,15 @@ env: jobs: default_values: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-default-value.yml@CURA-10831 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-default-value.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} latest_release: '5.6' latest_release_schedule_hour: 4 latest_release_tag: 'nightly' - # FIXME: point to `main` once merged windows-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-10831 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main needs: [ default_values ] with: cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} @@ -62,9 +61,8 @@ jobs: operating_system: windows-2022 secrets: inherit - # FIXME: point to `main` once merged linux-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-10831 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main needs: [ default_values ] with: cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} @@ -75,9 +73,8 @@ jobs: operating_system: ubuntu-22.04 secrets: inherit - # FIXME: point to `main` once merged macos-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-10831 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main needs: [ default_values ] with: cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} @@ -88,9 +85,8 @@ jobs: operating_system: self-hosted-X64 secrets: inherit - # FIXME: point to `main` once merged macos-arm-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-10831 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main needs: [ default_values ] with: cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 535d087700..2ad8f90bfe 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -45,9 +45,8 @@ env: STAGING: ${{ inputs.staging || false }} jobs: - # FIXME: point to `main` once merged windows-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-10831 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 02f45385e7..d080fcc710 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -49,9 +49,8 @@ env: STAGING: ${{ inputs.staging || false }} jobs: - # FIXME: point to `main` once merged windows-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-10831 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} diff --git a/.github/workflows/process-pull-request.yml b/.github/workflows/process-pull-request.yml index f34e26f13e..45b3f8c915 100644 --- a/.github/workflows/process-pull-request.yml +++ b/.github/workflows/process-pull-request.yml @@ -4,8 +4,7 @@ on: pull_request_target: types: [ opened, reopened, edited, review_requested, ready_for_review, assigned ] -# FIXME: Use `main` instead of `CURA-10831` once merged jobs: add_label: - uses: ultimaker/cura-workflows/.github/workflows/process-pull-request.yml@CURA-10831 + uses: ultimaker/cura-workflows/.github/workflows/process-pull-request.yml@main secrets: inherit \ No newline at end of file diff --git a/.github/workflows/unit-test-post.yml b/.github/workflows/unit-test-post.yml index b4ca2ee699..eaf69692a7 100644 --- a/.github/workflows/unit-test-post.yml +++ b/.github/workflows/unit-test-post.yml @@ -6,9 +6,8 @@ on: types: [ completed ] jobs: - # FIXME: Use `main` instead of `CURA-10831` once merged publish-test-results: - uses: ultimaker/cura-workflows/.github/workflows/unit-test-post.yml@CURA-10831 + uses: ultimaker/cura-workflows/.github/workflows/unit-test-post.yml@main with: event: ${{ github.event.workflow_run.event }} conclusion: ${{ github.event.workflow_run.conclusion }} diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 6369e7e395..7c6910b39f 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -45,15 +45,13 @@ env: CONAN_PASSWORD: ${{ secrets.CONAN_PASS }} jobs: - # FIXME: Change to `main` instead of `CURA-10831` once merged conan-recipe-version: - uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@CURA-10831 + uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main with: project_name: cura testing: - # FIXME: Change to `main` instead of `CURA-10831` once merged - uses: ultimaker/cura-workflows/.github/workflows/unit-test.yml@CURA-10831 + uses: ultimaker/cura-workflows/.github/workflows/unit-test.yml@main needs: [ conan-recipe-version ] with: recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ef7e986ec3..0007936969 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -45,9 +45,8 @@ env: STAGING: ${{ inputs.staging || false }} jobs: - # FIXME: point to `main` once merged windows-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-10831 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} diff --git a/conandata.yml b/conandata.yml index 0eec369c96..a28954bb3f 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,18 +1,18 @@ version: "5.7.0-alpha.0" requirements: - - "uranium/(latest)@ultimaker/cura_10831" - - "curaengine/(latest)@ultimaker/cura_10831" - - "cura_binary_data/(latest)@ultimaker/cura_10831" - - "fdm_materials/(latest)@ultimaker/cura_10831" - - "curaengine_plugin_gradual_flow/(latest)@ultimaker/cura_10831" - - "dulcificum/(latest)@ultimaker/cura_10831" + - "uranium/(latest)@ultimaker/latest" + - "curaengine/(latest)@ultimaker/latest" + - "cura_binary_data/(latest)@ultimaker/latest" + - "fdm_materials/(latest)@ultimaker/latest" + - "curaengine_plugin_gradual_flow/(latest)@ultimaker/stable" + - "dulcificum/(latest)@ultimaker/latest" - "pyarcus/5.3.0" - "pysavitar/5.3.0" - "pynest2d/5.3.0" - - "curaengine_grpc_definitions/(latest)@ultimaker/cura_10831" + - "curaengine_grpc_definitions/(latest)@ultimaker/latest" requirements_internal: - - "fdm_materials/(latest)@internal/cura_10831" - - "cura_private_data/(latest)@internal/cura_10831" + - "fdm_materials/(latest)@internal/latest" + - "cura_private_data/(latest)@internal/latest" urls: default: cloud_api_root: "https://api.ultimaker.com"