Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust GHA workflows to fix CI #532

Merged
merged 6 commits into from
Sep 24, 2024
Merged

Adjust GHA workflows to fix CI #532

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b8c81de
only install CLS test requirements for CLS tests
jaimergp Sep 23, 2024
bf788b4
do not rely on CONDA_PREFIX
jaimergp Sep 23, 2024
4e4e9ab
abs path to python?
jaimergp Sep 23, 2024
5e91838
more abs paths
jaimergp Sep 23, 2024
2b3085f
try with bash on Windows
jaimergp Sep 24, 2024
3ee60b9
Re-enable CI matrix
jaimergp Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ jobs:
--file tests\requirements-ci.txt
--file tests\requirements-s3.txt
--file ..\conda-libmamba-solver\dev\requirements.txt
--file ..\conda-libmamba-solver\tests\requirements.txt
${{ matrix.test-type == 'conda-libmamba-solver' && '--file ..\\conda-libmamba-solver\\tests\\requirements.txt' || '' }}
${{ env.REQUIREMENTS_TRUSTSTORE }}
python=${{ matrix.python-version }}

Expand Down Expand Up @@ -182,16 +182,12 @@ jobs:
- name: Run conda-libmamba-solver Tests
working-directory: conda-libmamba-solver
if: ${{ matrix.test-type == 'conda-libmamba-solver' }}
shell: cmd /C CALL {0}
shell: bash -el {0}
run: |
CALL python -m pip install -e ../conda/ --no-deps
if errorlevel 1 exit 1
CALL python -m conda init --all
if errorlevel 1 exit 1
CALL %CONDA_PREFIX%\Scripts\activate.bat
if errorlevel 1 exit 1
python -m pytest -vv -m "not slow" --reruns=${{ env.PYTEST_RERUN_FAILURES }} --durations=16 || exit 1
exit 0
python -m pip install -e ../conda/ --no-deps
python -m conda init --all
. $CONDA_PREFIX/etc/profile.d/conda.sh
python -m pytest -vv -m "not slow" --reruns=${{ env.PYTEST_RERUN_FAILURES }} --durations=16
#/ CONDA-LIBMAMBA-SOLVER CHANGE

- name: Upload Coverage
Expand Down Expand Up @@ -294,7 +290,7 @@ jobs:
--file tests/requirements-ci.txt
--file tests/requirements-s3.txt
--file ../conda-libmamba-solver/dev/requirements.txt
--file ../conda-libmamba-solver/tests/requirements.txt
${{ matrix.test-type == 'conda-libmamba-solver' && '--file ../conda-libmamba-solver/tests/requirements.txt' || '' }}
${{ env.REQUIREMENTS_TRUSTSTORE }}
python=${{ matrix.python-version }}

Expand Down Expand Up @@ -575,7 +571,7 @@ jobs:
--file tests/requirements-ci.txt
--file tests/requirements-s3.txt
--file ../conda-libmamba-solver/dev/requirements.txt
--file ../conda-libmamba-solver/tests/requirements.txt
${{ matrix.test-type == 'conda-libmamba-solver' && '--file ../conda-libmamba-solver/tests/requirements.txt' || '' }}
${{ env.REQUIREMENTS_TRUSTSTORE }}
python=${{ matrix.python-version }}

Expand Down
Loading