mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-09 23:05:01 -06:00
Move the Conan cache step before in conan-config install
It looks like the new conan configuration isn't applied, the ordering of the cache might influence this. At the very least it doens't hurt to do this step at the beginning of the workflow Contributes to CURA-9365
This commit is contained in:
parent
2f95fd2616
commit
4467491c36
2 changed files with 14 additions and 14 deletions
16
.github/workflows/conan-package-create.yml
vendored
16
.github/workflows/conan-package-create.yml
vendored
|
@ -52,14 +52,6 @@ jobs:
|
|||
pip install -r .github/workflows/requirements-conan-package.txt
|
||||
conan profile new default --detect
|
||||
|
||||
- name: Get Conan configuration from branch
|
||||
if: "${{ inputs.conan_config_branch == '' }}"
|
||||
run: conan config install https://github.com/Ultimaker/conan-config.git -a "-b ${{ inputs.conan_config_branch }}"
|
||||
|
||||
- name: Get Conan configuration
|
||||
if: "${{ inputs.conan_config_branch != '' }}"
|
||||
run: conan config install https://github.com/Ultimaker/conan-config.git
|
||||
|
||||
- name: Cache Conan local repository packages (Bash)
|
||||
uses: actions/cache@v3
|
||||
if: ${{ runner.os != 'Windows' }}
|
||||
|
@ -76,6 +68,14 @@ jobs:
|
|||
C:\.conan
|
||||
key: ${{ runner.os }}-conan
|
||||
|
||||
- name: Get Conan configuration from branch
|
||||
if: "${{ inputs.conan_config_branch == '' }}"
|
||||
run: conan config install https://github.com/Ultimaker/conan-config.git -a "-b ${{ inputs.conan_config_branch }}"
|
||||
|
||||
- name: Get Conan configuration
|
||||
if: "${{ inputs.conan_config_branch != '' }}"
|
||||
run: conan config install https://github.com/Ultimaker/conan-config.git
|
||||
|
||||
- name: Create the Packages
|
||||
run: conan install ${{ inputs.recipe_id_full }} -pr:b cura_build.jinja -pr:h cura_release.jinja --build=missing --update
|
||||
|
||||
|
|
12
.github/workflows/conan-recipe-export.yml
vendored
12
.github/workflows/conan-recipe-export.yml
vendored
|
@ -60,6 +60,12 @@ jobs:
|
|||
pip install -r .github/workflows/requirements-conan-package.txt
|
||||
conan profile new default --detect
|
||||
|
||||
- name: Cache Conan local repository packages
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: $HOME/.conan/data
|
||||
key: ${{ runner.os }}-conan
|
||||
|
||||
- name: Get Conan configuration from branch
|
||||
if: "${{ inputs.conan_config_branch == '' }}"
|
||||
run: conan config install https://github.com/Ultimaker/conan-config.git -a "-b ${{ inputs.conan_config_branch }}"
|
||||
|
@ -68,12 +74,6 @@ jobs:
|
|||
if: "${{ inputs.conan_config_branch != '' }}"
|
||||
run: conan config install https://github.com/Ultimaker/conan-config.git
|
||||
|
||||
- name: Cache Conan local repository packages
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: $HOME/.conan/data
|
||||
key: ${{ runner.os }}-conan
|
||||
|
||||
- name: Export the Package (binaries)
|
||||
if: "${{ inputs.conan_export_binaries == 'true' }}"
|
||||
run: conan export-pkg . ${{ inputs.recipe_id_full }}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue