Install Conan with pipx

thejohnfreeman · Jun 3, 2024 · 2a305cd · 2a305cd
1 parent 3300f83
commit 2a305cd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 20 deletions.
diff --git a/.github/actions/install-nix/action.yml b/.github/actions/install-nix/action.yml
@@ -11,16 +11,6 @@ runs:
       uses: ./.github/actions/install-python
       with:
         key: ${{ inputs.cache-key-python }}
-    - name: install Conan
-      shell: bash
-      run: |
-        venv=${HOME}/.venvs/conan
-        python -m venv ${venv}
-        ${venv}/bin/pip install --upgrade pip
-        ${venv}/bin/pip install 'conan<2'
-        mkdir -p ${HOME}/.local/bin
-        ln ${venv}/bin/conan ${HOME}/.local/bin/conan
-        echo ${HOME}/.local/bin >> ${GITHUB_PATH}
     - name: install Ninja on Linux
       if: startsWith(matrix.platform, 'ubuntu')
       shell: bash

diff --git a/.github/actions/install-python/action.yml b/.github/actions/install-python/action.yml
@@ -32,6 +32,10 @@ runs:
       run: |
         pip install --upgrade pip
         pip install poetry cupcake
+    - name: install Conan
+      shell: bash
+      run: |
+        pipx install 'conan<2'
     - name: configure Conan
       shell: bash
       run: |

diff --git a/.github/actions/install-windows/action.yml b/.github/actions/install-windows/action.yml
@@ -35,16 +35,6 @@ runs:
       uses: ./.github/actions/install-python
       with:
         key: ${{ inputs.cache-key-python }}
-    - name: install Conan
-      shell: bash
-      run: |
-        venv=${HOME}/.venvs/conan
-        python -m venv ${venv}
-        ${venv}/Scripts/pip install --upgrade pip
-        ${venv}/Scripts/pip install 'conan<2'
-        mkdir -p ${HOME}/.local/bin
-        ln ${venv}/Scripts/conan ${HOME}/.local/bin/conan
-        echo ${HOME}/.local/bin >> ${GITHUB_PATH}
     - name: check environment
       shell: pwsh
       run: |