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.

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

fix_pipeline #20

Merged
merged 12 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 4 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ jobs:
run: |
conda init bash
source ~/.bashrc
conda info
source activate ci_env
shell: bash

Expand All @@ -58,9 +57,10 @@ jobs:
source ~/.bashrc
mamba env remove --name ci_temp_env --yes || echo "Environment ci_temp_env does not exist"

conda create -n ci_temp_env --clone ci_env
mamba create -n ci_temp_env --clone ci_env
source activate ci_temp_env
mamba install json5
mamba install cmcrameri
rm -rf tests/testdata
wget -nv -c -O testdata.zip https://seafile.projekt.uni-hannover.de/f/4b3be399dffa488e98db/?dl=1
unzip testdata.zip
Expand Down Expand Up @@ -130,7 +130,6 @@ jobs:
run: |
conda init bash
source ~/.bashrc
conda info
source activate ci_env
make lint
shell: bash
Expand Down Expand Up @@ -173,7 +172,6 @@ jobs:
run: |
conda init bash
source ~/.bashrc
conda info
source activate ci_env
make urlcheck
shell: bash
Expand All @@ -192,9 +190,7 @@ jobs:
- name: Install dependencies
if: env.SKIP_INSTALL == 'false'
run: |
source $HOME/miniconda/bin/activate
mamba update -n base mamba conda
mamba info
source activate base
mamba env remove --name sarvey_testinstall --yes || echo "Environment sarvey_testinstall does not exist"
pip install conda-merge
wget https://raw.githubusercontent.com/insarlab/MiaplPy/main/conda-env.yml
Expand All @@ -203,7 +199,7 @@ jobs:
source activate sarvey_testinstall
pip install git+https://github.com/insarlab/MiaplPy.git
pip install .
pip check
OUTPUT=$(pip check) || { echo "$OUTPUT"; true; }
cd ..
python -c "import sarvey; print(sarvey)"
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion tests/CI_docker/context/sarvey_ci.docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM condaforge/mambaforge:latest as conda
FROM condaforge/miniforge3:latest

# update base environment
RUN --mount=type=cache,target=/opt/conda/pkgs \
Expand Down