GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 19:05:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.1'

Browse Source
This commit is contained in:
Jelle Spijker 2022-07-15 10:04:26 +02:00
commit 3def77416d
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/conan-package.yml vendored
View File

@ -61,7 +61,6 @@ jobs:
recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }}
runs_on: 'macos-10.15' runs_on: 'macos-10.15'
python_version: '3.10.x' python_version: '3.10.x'
conan_config_branch: 'master'
conan_logging_level: 'info' conan_logging_level: 'info'
conan_export_binaries: true conan_export_binaries: true
secrets: inherit secrets: inherit
@ -75,7 +74,6 @@ jobs:
recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }}
runs_on: 'ubuntu-20.04' runs_on: 'ubuntu-20.04'
python_version: '3.10.x' python_version: '3.10.x'
conan_config_branch: 'master'
conan_logging_level: 'info' conan_logging_level: 'info'
conan_export_binaries: true conan_export_binaries: true
secrets: inherit secrets: inherit
@ -89,7 +87,6 @@ jobs:
recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }}
runs_on: 'windows-2022' runs_on: 'windows-2022'
python_version: '3.10.x' python_version: '3.10.x'
conan_config_branch: 'master'
conan_logging_level: 'info' conan_logging_level: 'info'
conan_export_binaries: true conan_export_binaries: true
secrets: inherit secrets: inherit

4
.github/workflows/notify.yml vendored
View File

@ -36,7 +36,7 @@ jobs:
uses: rtCamp/action-slack-notify@v2 uses: rtCamp/action-slack-notify@v2
env: env:
SLACK_USERNAME: ${{ github.repository }} 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_ICON: https://github.com/Ultimaker/Cura/blob/main/icons/cura-128.png?raw=true
SLACK_TITLE: ${{ inputs.success_title }} SLACK_TITLE: ${{ inputs.success_title }}
SLACK_MESSAGE: ${{ inputs.success_body }} SLACK_MESSAGE: ${{ inputs.success_body }}
@ -47,7 +47,7 @@ jobs:
uses: rtCamp/action-slack-notify@v2 uses: rtCamp/action-slack-notify@v2
env: env:
SLACK_USERNAME: ${{ github.repository }} 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_ICON: https://github.com/Ultimaker/Cura/blob/main/icons/cura-128.png?raw=true
SLACK_TITLE: ${{ inputs.failure_title }} SLACK_TITLE: ${{ inputs.failure_title }}
SLACK_MESSAGE: ${{ inputs.failure_body }} SLACK_MESSAGE: ${{ inputs.failure_body }}