diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index 8aebf5e3e6..3706e4f97c 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -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 diff --git a/.github/workflows/conan-recipe-export.yml b/.github/workflows/conan-recipe-export.yml index 32278d781b..70837d6eb8 100644 --- a/.github/workflows/conan-recipe-export.yml +++ b/.github/workflows/conan-recipe-export.yml @@ -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 }}