From 37725db5e34df1b51e67b016340a96597a0f1957 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Thu, 12 Jan 2023 13:26:02 +0100 Subject: [PATCH] Added comment about requirements --- .github/workflows/conan-package-create.yml | 4 ++-- .github/workflows/conan-recipe-export.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index 863a1117d0..1c5f101189 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -75,8 +75,8 @@ jobs: cache-dependency-path: .github/workflows/requirements-conan-package.txt - name: Install Python requirements for runner - run: | - pip install -r https://raw.githubusercontent.com/Ultimaker/Cura/main/.github/workflows/requirements-conan-package.txt + run: pip install -r https://raw.githubusercontent.com/Ultimaker/Cura/main/.github/workflows/requirements-conan-package.txt + # Note the runner requirements are always installed from the main branch in the Ultimaker/Cura repo - name: Use Conan download cache (Bash) if: ${{ runner.os != 'Windows' }} diff --git a/.github/workflows/conan-recipe-export.yml b/.github/workflows/conan-recipe-export.yml index 5c953adef2..eebcd06f46 100644 --- a/.github/workflows/conan-recipe-export.yml +++ b/.github/workflows/conan-recipe-export.yml @@ -64,6 +64,7 @@ jobs: run: | pip install -r https://raw.githubusercontent.com/Ultimaker/Cura/main/.github/workflows/requirements-conan-package.txt conan profile new default --detect + # Note the runner requirements are always installed from the main branch in the Ultimaker/Cura repo - name: Cache Conan local repository packages uses: actions/cache@v3