mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-07 05:53:59 -06:00
Make sure the detection of the Conan profile happens after inst of build tools
This commit is contained in:
parent
8fa1cad635
commit
7b6e56287b
2 changed files with 9 additions and 8 deletions
8
.github/workflows/conan-package-create.yml
vendored
8
.github/workflows/conan-package-create.yml
vendored
|
@ -66,10 +66,8 @@ jobs:
|
|||
cache: 'pip'
|
||||
cache-dependency-path: .github/workflows/requirements-conan-package.txt
|
||||
|
||||
- name: Install Python requirements and Create default Conan profile
|
||||
run: |
|
||||
pip install -r .github/workflows/requirements-conan-package.txt
|
||||
conan profile new default --detect
|
||||
- name: Install Python requirements for runner
|
||||
run: pip install -r .github/workflows/requirements-conan-package.txt
|
||||
|
||||
- name: Use Conan download cache (Bash)
|
||||
if: ${{ runner.os != 'Windows' }}
|
||||
|
@ -114,6 +112,8 @@ jobs:
|
|||
if: ${{ matrix.os == 'ubuntu-22.04' }}
|
||||
run: sudo apt install g++-12 gcc-12 -y
|
||||
|
||||
- name: Create the default Conan profile
|
||||
run: conan profile new default --detec
|
||||
|
||||
- name: Get Conan configuration from branch
|
||||
if: ${{ inputs.conan_config_branch != '' }}
|
||||
|
|
9
.github/workflows/cura-installer.yml
vendored
9
.github/workflows/cura-installer.yml
vendored
|
@ -77,10 +77,8 @@ jobs:
|
|||
cache: 'pip'
|
||||
cache-dependency-path: .github/workflows/requirements-conan-package.txt
|
||||
|
||||
- name: Install Python requirements and Create default Conan profile
|
||||
run: |
|
||||
pip install -r .github/workflows/requirements-conan-package.txt
|
||||
conan profile new default --detect
|
||||
- name: Install Python requirements for runner
|
||||
run: pip install -r .github/workflows/requirements-conan-package.txt
|
||||
|
||||
- name: Use Conan download cache (Bash)
|
||||
if: ${{ runner.os != 'Windows' }}
|
||||
|
@ -128,6 +126,9 @@ jobs:
|
|||
if: ${{ matrix.os == 'ubuntu-22.04' }}
|
||||
run: sudo apt install g++-12 gcc-12 -y
|
||||
|
||||
- name: Create the default Conan profile
|
||||
run: conan profile new default --detect
|
||||
|
||||
- name: Configure GPG Key Linux (Bash)
|
||||
if: ${{ runner.os == 'Linux' }}
|
||||
run: echo -n "$GPG_PRIVATE_KEY" | base64 --decode | gpg --import
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue