diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml index ece3c797e296..5974d171cd61 100644 --- a/.github/actions/install/action.yml +++ b/.github/actions/install/action.yml @@ -10,7 +10,7 @@ inputs: development: description: "Install development dependencies." required: false - default: "" + default: "false" editable: description: "Install as editable source." required: false @@ -45,7 +45,7 @@ runs: env: INSTALL_PYTHON_VERSION: ${{ inputs.python-version }} run: | - ${{ inputs.command-prefix }} sh install.sh ${{ inputs.development && '-d' || '' }} ${{ (inputs.editable != 'true') && '-i' || '' }} ${{ inputs.legacy_keyring && '-l' || '' }} ${{ inputs.automated == 'true' && '-a' || '' }} ${{ (fromJSON(inputs.do-system-installs) != true) && '-s' || '' }} + ${{ inputs.command-prefix }} sh install.sh ${{ inputs.development == 'true' && '-d' || '' }} ${{ (inputs.editable != 'true') && '-i' || '' }} ${{ inputs.legacy_keyring && '-l' || '' }} ${{ inputs.automated == 'true' && '-a' || '' }} ${{ (fromJSON(inputs.do-system-installs) != true) && '-s' || '' }} - name: Run install script (Windows) if: runner.os == 'windows' @@ -53,7 +53,7 @@ runs: env: INSTALL_PYTHON_VERSION: ${{ inputs.python-version }} run: | - ${{ inputs.command-prefix }} ./Install.ps1 ${{ inputs.development && '-d' || '' }} ${{ (inputs.editable != 'true') && '-i' || '' }} + ${{ inputs.command-prefix }} ./Install.ps1 ${{ inputs.development == 'true' && '-d' || '' }} ${{ (inputs.editable != 'true') && '-i' || '' }} - name: Create constraints file if: inputs.constraints-file-artifact-name != '' diff --git a/.github/workflows/test-install-scripts.yml b/.github/workflows/test-install-scripts.yml index ed5bc51e935b..6e37bc93bc87 100644 --- a/.github/workflows/test-install-scripts.yml +++ b/.github/workflows/test-install-scripts.yml @@ -24,12 +24,19 @@ concurrency: jobs: test_scripts: name: Test Install Scripts - ${{ matrix.development.name }} - runs-on: ${{ matrix.os }} + runs-on: ${{ matrix.os.runs-on }} strategy: fail-fast: false matrix: - python-version: ["3.10"] - os: [macOS-latest, ubuntu-latest] + python: + - major-dot-minor: "3.10" + os: + - runs-on: macos-latest + matrix: macos + - runs-on: ubuntu-latest + matrix: linux + - runs-on: windows-latest + matrix: windows development: - name: Non-development value: false @@ -45,11 +52,11 @@ jobs: - name: Setup Python environment uses: Chia-Network/actions/setup-python@main with: - python-version: ${{ matrix.python-version }} + python-version: ${{ matrix.python.major-dot-minor }} - uses: ./.github/actions/install with: - python-version: ${{ matrix.python-version }} + python-version: ${{ matrix.python.major-dot-minor }} development: ${{ matrix.development.value }} do-system-installs: true @@ -59,10 +66,16 @@ jobs: run: | chia --help - - name: Run install-gui script + - name: Run install-gui script (Linux, macOS) + if: matrix.os.matrix != 'windows' run: | sh install-gui.sh + - name: Run install-gui script (Windows) + if: matrix.os.matrix == 'windows' + run: | + ./Install-gui.ps1 + test_scripts_in_docker: name: Test Install Scripts ${{ matrix.distribution.name }} ${{ matrix.arch.name }} runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }} diff --git a/Install.ps1 b/Install.ps1 index 63c18bfb1b0b..e300b281e668 100644 --- a/Install.ps1 +++ b/Install.ps1 @@ -105,6 +105,10 @@ if ($extras.length -gt 0) $extras_cli = $extras -join "," $pip_parameters += ".[$extras_cli]" } +else +{ + $pip_parameters += "." +} py -$pythonVersion -m venv venv