mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-05 21:13:58 -06:00
Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library
This commit is contained in:
commit
5dbef74e22
38 changed files with 1466 additions and 2597 deletions
3
.github/workflows/conan-package.yml
vendored
3
.github/workflows/conan-package.yml
vendored
|
@ -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
|
||||
|
|
2
.github/workflows/conan-recipe-version.yml
vendored
2
.github/workflows/conan-recipe-version.yml
vendored
|
@ -45,7 +45,7 @@ jobs:
|
|||
uses: actions/checkout@v3
|
||||
with:
|
||||
ref: ${{ github.head_ref }}
|
||||
fetch-depth: 0
|
||||
fetch-depth: 3000
|
||||
|
||||
- name: Setup Python and pip
|
||||
uses: actions/setup-python@v4
|
||||
|
|
4
.github/workflows/notify.yml
vendored
4
.github/workflows/notify.yml
vendored
|
@ -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 }}
|
||||
|
|
33
.github/workflows/unit-test.yml
vendored
33
.github/workflows/unit-test.yml
vendored
|
@ -125,13 +125,40 @@ jobs:
|
|||
pytest --junitxml=junit_cura.xml
|
||||
working-directory: tests
|
||||
|
||||
- name: Upload Test Results
|
||||
if: always()
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: Test Results
|
||||
path: "tests/**/*.xml"
|
||||
|
||||
publish-test-results:
|
||||
runs-on: ubuntu-20.04
|
||||
needs: [ testing ]
|
||||
if: success() || failure()
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup Python and pip
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.10.x'
|
||||
architecture: 'x64'
|
||||
cache: 'pip'
|
||||
cache-dependency-path: .github/workflows/requirements-conan-package.txt
|
||||
|
||||
- name: Download Artifacts
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
path: artifacts
|
||||
|
||||
- name: Publish Unit Test Results
|
||||
id: test-results
|
||||
uses: EnricoMi/publish-unit-test-result-action@v1
|
||||
if: ${{ always() }}
|
||||
with:
|
||||
files: |
|
||||
tests/*.xml
|
||||
files: "artifacts/**/*.xml"
|
||||
|
||||
- name: Conclusion
|
||||
run: echo "Conclusion is ${{ fromJSON( steps.test-results.outputs.json ).conclusion }}"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue