Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0678f96
Accept the terms of service for conda repos
bpkroth Jul 17, 2025
a3a82f7
Make conda output easier for debugging
bpkroth Jul 17, 2025
fcbfc49
more output adjustments
bpkroth Jul 17, 2025
c666915
Revert "more output adjustments"
bpkroth Jul 17, 2025
2dcfa42
Revert "Make conda output easier for debugging"
bpkroth Jul 17, 2025
9965602
try a suggestion
bpkroth Jul 17, 2025
57b673a
fixups
bpkroth Jul 17, 2025
2084a08
Merge branch 'main' into ci-fixups
bpkroth Jul 17, 2025
ecebe33
type fixups
bpkroth Sep 18, 2025
e7f524d
type checking fixups
bpkroth Sep 18, 2025
1b490ae
use conda by default
bpkroth Sep 18, 2025
9ad7794
small pyright fixups
bpkroth Sep 22, 2025
3c0aa23
Install pre-built pyrfr from conda to workaround build error.
bpkroth Sep 22, 2025
a8d9ccd
ignore a deprecation warning in matplotlib
bpkroth Sep 22, 2025
1862037
fixups
bpkroth Sep 22, 2025
b2530a3
ignore more warnings
bpkroth Sep 22, 2025
d914bcc
Avoid Debian trixie for now since there's no azure-cli package yet. …
bpkroth Sep 22, 2025
b6b5561
Moby has also been removed from Debian Trixie
bpkroth Sep 22, 2025
b059ac3
add more debug logging for missing docker support
bpkroth Sep 23, 2025
021f451
more debugging
bpkroth Sep 23, 2025
ac57951
comments
bpkroth Sep 23, 2025
4462cdf
fixup for local testing
bpkroth Sep 23, 2025
74d94cf
log docker missing warnings
bpkroth Sep 23, 2025
797ac40
comments and revert to moby
bpkroth Sep 23, 2025
72aec7b
upload the coverage.xml file regardless
bpkroth Sep 23, 2025
9fd6843
comments and port forwarding for doc viewing
bpkroth Sep 23, 2025
6fbd25b
revert
bpkroth Sep 23, 2025
382ab78
revertme: temporarily make docker required to see what the issue is i…
bpkroth Sep 23, 2025
496fba8
more debugging
bpkroth Sep 24, 2025
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
5 changes: 5 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ COPY --from=deps-prep --chown=vscode:conda /tmp/conda-tmp/.pre-commit-config.yam
# Combine the installation of miniconda and the mlos dependencies into a single step in order to save space.
# This allows the mlos env to reference the base env's packages without duplication across layers.
RUN echo "Setup miniconda" \
&& set -x \
&& export CONDA_NO_PROGRESS_BARS=1 \
&& curl -Ss --url https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-$(uname -m).sh -o /tmp/miniconda3.sh \
&& sudo sh /tmp/miniconda3.sh -b -u -p /opt/conda \
&& rm -rf /tmp/miniconda3.sh \
Expand All @@ -80,6 +82,9 @@ RUN echo "Setup miniconda" \
&& /opt/conda/bin/conda init \
&& /opt/conda/bin/conda config --set channel_priority strict \
&& /opt/conda/bin/conda info \
&& /opt/conda/bin/conda config --show \
&& /opt/conda/bin/conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main \
&& /opt/conda/bin/conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r \
&& /opt/conda/bin/conda update -v -y -n base -c conda-forge -c defaults --all \
&& /opt/conda/bin/conda list -n base \
&& /opt/conda/bin/conda install -v -y -n base -c conda-forge -c defaults conda-libmamba-solver \
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ jobs:
CONDA_ENV_NAME: unset
# See notes about $CONDA below.
CONDA_DIR: unset
# Use simple output for conda.
CONDA_NO_PROGRESS_BARS: 1
# When parallel jobs are used, group the output to make debugging easier.
MAKEFLAGS: -Oline

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ jobs:
CONDA_ENV_NAME: unset
# See notes about $CONDA below.
CONDA_DIR: unset
# Use simple output for conda.
CONDA_NO_PROGRESS_BARS: 1
# When parallel jobs are used, group the output to make debugging easier.
MAKEFLAGS: -Oline

Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ CONDA_ENV_NAME ?= mlos
PYTHON_VERSION := $(shell echo "${CONDA_ENV_NAME}" | sed -r -e 's/^mlos[-]?//')
ENV_YML := conda-envs/${CONDA_ENV_NAME}.yml

CONDA_NO_PROGRESS_BARS ?= 1
export CONDA_NO_PROGRESS_BARS

# Find the non-build python files we should consider as rule dependencies.
# Do a single find and multiple filters for better performance.
REPO_FILES := $(shell find . -type f 2>/dev/null | egrep -v -e '^./(mlos_(core|bench|viz)/)?build/' -e '^./doc/source/' -e '^./doc/build/')
Expand Down
Loading