diff options
| author | Jelle Spijker <j.spijker@ultimaker.com> | 2022-07-15 11:04:26 +0300 |
|---|---|---|
| committer | Jelle Spijker <j.spijker@ultimaker.com> | 2022-07-15 11:04:26 +0300 |
| commit | 3def77416d8668146863db73e41f8574fe48067a (patch) | |
| tree | 0163d0148768f6ddcd40939c3cf180f7b9f5c02e /.github | |
| parent | 17748d0a9acbd279f1a993c5f88b673e43c2a1c4 (diff) | |
| parent | a0d775b90e01a9b9d1b003e1177d694e832894c7 (diff) | |
Merge branch '5.1'
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/conan-package.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/notify.yml | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 4f0ec17ad5..60994a7a36 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -61,7 +61,6 @@ jobs: recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} runs_on: 'macos-10.15' python_version: '3.10.x' - conan_config_branch: 'master' conan_logging_level: 'info' conan_export_binaries: true secrets: inherit @@ -75,7 +74,6 @@ jobs: recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} runs_on: 'ubuntu-20.04' python_version: '3.10.x' - conan_config_branch: 'master' conan_logging_level: 'info' conan_export_binaries: true secrets: inherit @@ -89,7 +87,6 @@ jobs: recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} runs_on: 'windows-2022' python_version: '3.10.x' - conan_config_branch: 'master' conan_logging_level: 'info' conan_export_binaries: true secrets: inherit diff --git a/.github/workflows/notify.yml b/.github/workflows/notify.yml index 3d421905d0..370b54c78b 100644 --- a/.github/workflows/notify.yml +++ b/.github/workflows/notify.yml @@ -36,7 +36,7 @@ jobs: uses: rtCamp/action-slack-notify@v2 env: SLACK_USERNAME: ${{ github.repository }} - SLACK_COLOR: #00ff00 + SLACK_COLOR: green SLACK_ICON: https://github.com/Ultimaker/Cura/blob/main/icons/cura-128.png?raw=true SLACK_TITLE: ${{ inputs.success_title }} SLACK_MESSAGE: ${{ inputs.success_body }} @@ -47,7 +47,7 @@ jobs: uses: rtCamp/action-slack-notify@v2 env: SLACK_USERNAME: ${{ github.repository }} - SLACK_COLOR: #ff0000 + SLACK_COLOR: red SLACK_ICON: https://github.com/Ultimaker/Cura/blob/main/icons/cura-128.png?raw=true SLACK_TITLE: ${{ inputs.failure_title }} SLACK_MESSAGE: ${{ inputs.failure_body }} |