diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cc8adfa3..f8e1011d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -88,6 +88,7 @@ jobs: pytest-xdist - name: Install dev deps + shell: bash -eo pipefail -l {0} run: | set -x echo "${PATH}" @@ -96,13 +97,13 @@ jobs: python -m pip install -r requirements-dev.txt - name: install conda-lock - shell: bash -l {0} + shell: bash -eo pipefail -l {0} run: | which pip pip install -e . --force-reinstall - name: run-test - shell: bash -l {0} + shell: bash -eo pipefail -l {0} run: | cp pyproject.toml "${RUNNER_TEMP}/" cp -a tests "${RUNNER_TEMP}/" @@ -116,7 +117,7 @@ jobs: - uses: codecov/codecov-action@v3 - name: test-gdal - shell: bash -l {0} + shell: bash -eo pipefail -l {0} run: | pushd "${RUNNER_TEMP}/tests/gdal" export TMPDIR="${RUNNER_TEMP}" diff --git a/conda_lock/conda_solver.py b/conda_lock/conda_solver.py index be65c888..402bb143 100644 --- a/conda_lock/conda_solver.py +++ b/conda_lock/conda_solver.py @@ -492,7 +492,7 @@ def update_specs_for_arch( f"Could not lock the environment for platform {platform}: {err_json.get('message')}" ) from exc - dryrun_install: DryRunInstall = json.loads(proc.stdout) + dryrun_install: DryRunInstall = json.loads(extract_json_object(proc.stdout)) else: dryrun_install = {"actions": {"LINK": [], "FETCH": []}}