diff --git a/.github/workflows/python-build.yml b/.github/workflows/python-build.yml index 5d5778a..870f672 100644 --- a/.github/workflows/python-build.yml +++ b/.github/workflows/python-build.yml @@ -1,4 +1,4 @@ -name: Python modules +name: Python modules (build) on: push: @@ -17,6 +17,8 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest] python-version: ["3.9", "3.10", "3.11"] runs-on: ${{ matrix.os }} + env: + BIN_DIR: ${{ runner.os == 'Windows' && 'Scripts' || 'bin' }} steps: - uses: actions/checkout@v3 @@ -41,17 +43,17 @@ jobs: python -m pip install --upgrade pip build mkdir .venv python -m venv .venv/build - (. .venv/build/bin/activate && python -m pip install --upgrade pip build && deactivate) + (. .venv/build/${{ env.BIN_DIR }}/activate && python -m pip install --upgrade pip build && deactivate) python -m venv .venv/build-cli - (. .venv/build-cli/bin/activate && python -m pip install --upgrade pip build && deactivate) + (. .venv/build-cli/${{ env.BIN_DIR }}/activate && python -m pip install --upgrade pip build && deactivate) python -m venv .venv/install - (. .venv/install/bin/activate && python -m pip install --upgrade pip build && deactivate) + (. .venv/install/${{ env.BIN_DIR }}/activate && python -m pip install --upgrade pip build && deactivate) - name: Test building and packaging run: | - (. .venv/build/bin/activate && cd partcad && python -m build && deactivate) - (. .venv/build-cli/bin/activate && python -m pip install partcad/dist/partcad-[0-9].[0-9]*.[0-9]*-py3-none-any.whl && deactivate) - (. .venv/build-cli/bin/activate && cd partcad-cli && python -m build && deactivate) + (. .venv/build/${{ env.BIN_DIR }}/activate && cd partcad && python -m build && deactivate) + (. .venv/build-cli/${{ env.BIN_DIR }}/activate && python -m pip install partcad/dist/partcad-[0-9].[0-9]*.[0-9]*-py3-none-any.whl && deactivate) + (. .venv/build-cli/${{ env.BIN_DIR }}/activate && cd partcad-cli && python -m build && deactivate) - name: Test installation run: | - (. .venv/install/bin/activate && python -m pip install partcad/dist/partcad-[0-9].[0-9]*.[0-9]*-py3-none-any.whl && deactivate) - (. .venv/install/bin/activate && python -m pip install partcad-cli/dist/partcad_cli-[0-9].[0-9]*.[0-9]*-py3-none-any.whl && deactivate) + (. .venv/install/${{ env.BIN_DIR }}/activate && python -m pip install partcad/dist/partcad-[0-9].[0-9]*.[0-9]*-py3-none-any.whl && deactivate) + (. .venv/install/${{ env.BIN_DIR }}/activate && python -m pip install partcad-cli/dist/partcad_cli-[0-9].[0-9]*.[0-9]*-py3-none-any.whl && deactivate) diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml index 5ae51f0..7e480c5 100644 --- a/.github/workflows/python-test.yml +++ b/.github/workflows/python-test.yml @@ -1,4 +1,4 @@ -name: Python modules +name: Python modules (test) on: push: