GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 03:35:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make sure the detection of the Conan profile happens after inst of build tools

Browse Source
This commit is contained in:
jspijker 2022-08-09 13:37:15 +02:00
parent 8fa1cad635
commit 7b6e56287b
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,10 +66,8 @@ jobs:
cache: 'pip' cache: 'pip'
cache-dependency-path: .github/workflows/requirements-conan-package.txt cache-dependency-path: .github/workflows/requirements-conan-package.txt
- name: Install Python requirements and Create default Conan profile - name: Install Python requirements for runner
run: | run: pip install -r .github/workflows/requirements-conan-package.txt
pip install -r .github/workflows/requirements-conan-package.txt
conan profile new default --detect
- name: Use Conan download cache (Bash) - name: Use Conan download cache (Bash)
if: ${{ runner.os != 'Windows' }} if: ${{ runner.os != 'Windows' }}
@ -114,6 +112,8 @@ jobs:
if: ${{ matrix.os == 'ubuntu-22.04' }} if: ${{ matrix.os == 'ubuntu-22.04' }}
run: sudo apt install g++-12 gcc-12 -y 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 - name: Get Conan configuration from branch
if: ${{ inputs.conan_config_branch != '' }} if: ${{ inputs.conan_config_branch != '' }}

9
.github/workflows/cura-installer.yml vendored
View File

@ -77,10 +77,8 @@ jobs:
cache: 'pip' cache: 'pip'
cache-dependency-path: .github/workflows/requirements-conan-package.txt cache-dependency-path: .github/workflows/requirements-conan-package.txt
- name: Install Python requirements and Create default Conan profile - name: Install Python requirements for runner
run: | run: pip install -r .github/workflows/requirements-conan-package.txt
pip install -r .github/workflows/requirements-conan-package.txt
conan profile new default --detect
- name: Use Conan download cache (Bash) - name: Use Conan download cache (Bash)
if: ${{ runner.os != 'Windows' }} if: ${{ runner.os != 'Windows' }}
@ -128,6 +126,9 @@ jobs:
if: ${{ matrix.os == 'ubuntu-22.04' }} if: ${{ matrix.os == 'ubuntu-22.04' }}
run: sudo apt install g++-12 gcc-12 -y 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) - name: Configure GPG Key Linux (Bash)
if: ${{ runner.os == 'Linux' }} if: ${{ runner.os == 'Linux' }}
run: echo -n "$GPG_PRIVATE_KEY" | base64 --decode | gpg --import run: echo -n "$GPG_PRIVATE_KEY" | base64 --decode | gpg --import