Skip to content

Commit 24aa5f0

Browse files
Fix installation GH workflow
Signed-off-by: Jean-Christophe Morin <[email protected]>
1 parent 635d362 commit 24aa5f0

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

.github/workflows/installation.yaml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,16 @@ jobs:
4747
4848
- os: ubuntu-latest
4949
method: pip
50-
REZ_SET_PATH_COMMAND: 'export PATH=${PATH}:/opt/rez/bin/rez PYTHONPATH=${PYTHONPATH}:/opt/rez'
50+
REZ_SET_PATH_COMMAND: 'export PATH=${PATH}:/opt/rez/bin/rez'
5151
REZ_INSTALL_COMMAND: |
5252
set -ex
5353
if [[ "${MATRIX_PYTHON_VERSION}" == "2.7" ]]; then
5454
eval "$(conda shell.bash hook)"
5555
conda activate python
5656
fi
57-
pip install --target /opt/rez .
57+
python -m pip install virtualenv
58+
python -m virtualenv /opt/rez
59+
/opt/rez/bin/python -m pip install .
5860
# macOS
5961
- os: macos-latest
6062
method: install
@@ -74,14 +76,16 @@ jobs:
7476
python ./install.py ~/rez
7577
- os: macos-latest
7678
method: pip
77-
REZ_SET_PATH_COMMAND: 'export PATH="$PATH:~/rez/bin/rez" PYTHONPATH=$PYTHONPATH:$HOME/rez'
79+
REZ_SET_PATH_COMMAND: 'export PATH="$PATH:~/rez/bin/rez"'
7880
REZ_INSTALL_COMMAND: |
7981
set -ex
8082
if [[ "${MATRIX_PYTHON_VERSION}" == "2.7" ]]; then
8183
eval "$(conda shell.bash hook)"
8284
conda activate python
8385
fi
84-
pip install --target ~/rez .
86+
python -m pip install virtualenv
87+
python -m virtualenv ~/rez
88+
~/rez/bin/python -m pip install .
8589
# windows
8690
- os: windows-2019
8791
method: install
@@ -94,13 +98,16 @@ jobs:
9498
python ./install.py C:\ProgramData\rez
9599
- os: windows-2019
96100
method: pip
97-
REZ_SET_PATH_COMMAND: '[System.Environment]::SetEnvironmentVariable("PATH","$env:PATH;C:\ProgramData\rez\bin\rez"); $env:PYTHONPATH="$env:PYTHONPATH;C:\ProgramData\rez"'
101+
REZ_SET_PATH_COMMAND: '[System.Environment]::SetEnvironmentVariable("PATH","$env:PATH;C:\ProgramData\rez\bin\rez")'
98102
REZ_INSTALL_COMMAND: |
99103
if ($env:MATRIX_PYTHON_VERSION -eq "2.7") {
100104
& 'C:\Miniconda\shell\condabin\conda-hook.ps1'
101105
conda activate python
102106
}
103-
pip install --target C:\ProgramData\rez .
107+
108+
python -m pip install virtualenv
109+
python -m virtualenv C:\ProgramData\rez
110+
C:\ProgramData\rez\Scripts\python.exe -m pip install .
104111
105112
steps:
106113
- uses: actions/checkout@v3

0 commit comments

Comments
 (0)