GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-20 17:39:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move the Conan cache step before in conan-config install

Browse Source 
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:
j.spijker@ultimaker.com 2022-06-21 10:23:38 +02:00 committed by Jelle Spijker
parent 2f95fd2616
commit 4467491c36
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/conan-package-create.yml vendored
View File

@ -52,14 +52,6 @@ jobs:
pip install -r .github/workflows/requirements-conan-package.txt pip install -r .github/workflows/requirements-conan-package.txt
conan profile new default --detect 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) - name: Cache Conan local repository packages (Bash)
uses: actions/cache@v3 uses: actions/cache@v3
if: ${{ runner.os != 'Windows' }} if: ${{ runner.os != 'Windows' }}
@ -76,6 +68,14 @@ jobs:
C:\.conan C:\.conan
key: ${{ runner.os }}-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 - name: Create the Packages
run: conan install ${{ inputs.recipe_id_full }} -pr:b cura_build.jinja -pr:h cura_release.jinja --build=missing --update 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
View File

@ -60,6 +60,12 @@ jobs:
pip install -r .github/workflows/requirements-conan-package.txt pip install -r .github/workflows/requirements-conan-package.txt
conan profile new default --detect 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 - name: Get Conan configuration from branch
if: "${{ inputs.conan_config_branch == '' }}" if: "${{ inputs.conan_config_branch == '' }}"
run: conan config install https://github.com/Ultimaker/conan-config.git -a "-b ${{ 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 != '' }}" if: "${{ inputs.conan_config_branch != '' }}"
run: conan config install https://github.com/Ultimaker/conan-config.git 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) - name: Export the Package (binaries)
if: "${{ inputs.conan_export_binaries == 'true' }}" if: "${{ inputs.conan_export_binaries == 'true' }}"
run: conan export-pkg . ${{ inputs.recipe_id_full }} run: conan export-pkg . ${{ inputs.recipe_id_full }}