Skip to content

Commit

Permalink
Fix Miniconda CI Windows install (#249) (#250)
Browse files Browse the repository at this point in the history
  • Loading branch information
manoelmarques committed Sep 14, 2021
1 parent 2f1dfe4 commit cc4a6f1
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/actions/install-main-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ runs:
run: |
if [ "${{ inputs.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate
conda activate scsenv
fi
pip install git+https://github.com/Qiskit/qiskit-terra
if [ "${{ inputs.os }}" == "ubuntu-latest" ]; then
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/install-optimization/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ runs:
- run : |
if [ "${{ inputs.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate
conda activate scsenv
fi
pip install -e .[cplex,cvx,matplotlib,gurobi]
pip install -U -c constraints.txt -r requirements-dev.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/run-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ runs:
run: |
if [ "${{ inputs.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate
conda activate scsenv
fi
# run slow tests only on scheduled event or if input flag is set
if [ "${{ inputs.event-name }}" == "schedule" ] || [ "${{ inputs.run-slow }}" == "true" ]; then
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ jobs:
- name: install Windows dependencies
run: |
source "$CONDA/etc/profile.d/conda.sh"
conda install -y python=${{ matrix.python-version }}
conda activate
conda create -n scsenv python=${{ matrix.python-version }}
conda activate scsenv
conda install -y scs lapack cvxpy -c conda-forge
if: ${{ matrix.os == 'windows-latest' }}
shell: bash
Expand All @@ -132,15 +132,15 @@ jobs:
run: |
if [ "${{ matrix.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate
conda activate scsenv
fi
make lint
shell: bash
- name: Run mypy
run: |
if [ "${{ matrix.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate
conda activate scsenv
fi
make mypy
if: ${{ !cancelled() }}
Expand All @@ -149,7 +149,7 @@ jobs:
run: |
if [ "${{ matrix.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate
conda activate scsenv
fi
pip install -U pylint
make lint
Expand All @@ -166,7 +166,7 @@ jobs:
run: |
if [ "${{ matrix.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate
conda activate scsenv
fi
mkdir ./ci-artifact-data
python tools/extract_deprecation.py -file out.txt -output ./ci-artifact-data/opt.dep
Expand All @@ -175,7 +175,7 @@ jobs:
run: |
if [ "${{ matrix.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate
conda activate scsenv
fi
coverage3 combine
mv .coverage ./ci-artifact-data/opt.dat
Expand All @@ -191,7 +191,7 @@ jobs:
run: |
if [ "${{ matrix.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate
conda activate scsenv
fi
pip uninstall -y cplex cvxpy matplotlib gurobipy
if [ "${{ github.event_name }}" == "schedule" ] || [ "${{ contains(github.event.pull_request.labels.*.name, 'run_slow') }}" == "true" ]; then
Expand Down

0 comments on commit cc4a6f1

Please sign in to comment.