From 7b6e56287b487d78e53d5eba3deb1b00162c2bb8 Mon Sep 17 00:00:00 2001 From: jspijker Date: Tue, 9 Aug 2022 13:37:15 +0200 Subject: [PATCH] Make sure the detection of the Conan profile happens after inst of build tools --- .github/workflows/conan-package-create.yml | 8 ++++---- .github/workflows/cura-installer.yml | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index 07de113222..c13a0fb9b0 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -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 != '' }} diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 68daa681d3..a39f8d9019 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -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