Skip to content

Commit 155fe04

Browse files
committed
cleanup
1 parent 0e96ef7 commit 155fe04

File tree

1 file changed

+7
-35
lines changed

1 file changed

+7
-35
lines changed

.github/workflows/ci.yml

+7-35
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
name: Sharpy CI
22
run-name: ${{ github.actor }} CI for sharpy
33
permissions: read-all
4+
45
on:
56
push:
67
branches:
78
- main
89
pull_request:
10+
911
defaults:
1012
run:
1113
shell: bash -l {0}
14+
1215
env:
1316
IMEX_CACHE_NUMBER: 4 # Increase to reset cache
17+
1418
jobs:
1519
build_and_test:
1620
runs-on: ubuntu-22.04
@@ -22,8 +26,6 @@ jobs:
2226
with:
2327
submodules: recursive
2428
- name: Setup env
25-
# CONDA_ROOT="$(realpath $GITHUB_WORKSPACE/..)/install/miniconda3"
26-
# echo "CONDA_ROOT=$CONDA_ROOT" >> "$GITHUB_ENV"
2729
run: |
2830
INSTALLED_DIR="$(realpath $GITHUB_WORKSPACE)/third_party/install"
2931
echo "INSTALLED_DIR=$INSTALLED_DIR" >> "$GITHUB_ENV"
@@ -36,56 +38,28 @@ jobs:
3638
with:
3739
path: third_party/install/**
3840
key: ${{ runner.os }}-build-imex-${{ env.IMEX_CACHE_NUMBER }}-${{ env.IMEX_SHA }}
39-
- name: Miniforge
41+
- name: Setup Miniforge
4042
uses: conda-incubator/setup-miniconda@v3
4143
with:
4244
miniforge-version: latest
4345
# environment-file: etc/example-environment.yml
44-
- name: Test Conda
45-
run: |
46-
conda create -n testenv conda-build
47-
conda activate testenv
48-
which python
49-
conda deactivate
50-
conda env remove -n testenv
51-
# - name: Miniconda
52-
# run: |
53-
# env
54-
# rm -rf $CONDA_ROOT
55-
# cd $GITHUB_WORKSPACE/..
56-
# rm -f Miniconda3-*.sh
57-
# CPKG=Miniforge3-Linux-x86_64.sh
58-
# wget -q https://github.com/conda-forge/miniforge/releases/latest/download/$CPKG
59-
# bash $CPKG -u -b -f -p $CONDA_ROOT
60-
# export PATH=$CONDA_ROOT/condabin:$CONDA_ROOT/bin:${PATH}
61-
# eval "$($CONDA_ROOT/bin/python -m conda shell.bash hook)"
62-
# conda install -c conda-forge --override-channels python git-lfs 'conda-build<=24.1.2'
63-
# # aahhhh bug in conda somewhere
64-
# sed -i "s,\#\!/usr/bin/env python,#\!$CONDA_ROOT/bin/python," $CONDA_ROOT/*bin/conda
65-
# conda clean --all -y
6646
- name: Build SHARPY
67-
# export PATH=$CONDA_ROOT/condabin:$CONDA_ROOT/bin:${PATH}
68-
# eval "$($CONDA_ROOT/bin/python -m conda shell.bash hook)"
6947
run: |
7048
env
7149
conda install -y conda-build
7250
cd conda-recipe
73-
conda build --numpy 1.26 -c conda-forge --override-channels --no-anaconda-upload --no-test .
51+
conda build --numpy 1.26 --no-anaconda-upload --no-test .
7452
- name: Save IMEX cache
7553
uses: actions/cache/save@v3
7654
if: steps.cache-imex.outputs.cache-hit != 'true'
7755
with:
7856
path: third_party/install/**
7957
key: ${{ runner.os }}-build-imex-${{ env.IMEX_CACHE_NUMBER }}-${{ env.IMEX_SHA }}
8058
- name: Install SHARPY
81-
# export PATH=$CONDA_ROOT/condabin:$CONDA_ROOT/bin:${PATH}
82-
# eval "$($CONDA_ROOT/bin/python -m conda shell.bash hook)"
8359
run: |
84-
conda create --use-local -c conda-forge --override-channels -n sharpy -v sharpy pytest pytest-timeout
60+
conda create --use-local -n sharpy -v sharpy pytest pytest-timeout
8561
conda activate sharpy
8662
- name: Test SHARPY (pytest)
87-
# export PATH=$CONDA_ROOT/condabin:$CONDA_ROOT/bin:${PATH}
88-
# eval "$($CONDA_ROOT/bin/python -m conda shell.bash hook)"
8963
run: |
9064
conda activate sharpy
9165
cd test
@@ -96,8 +70,6 @@ jobs:
9670
mpirun -n 4 pytest . -v -s --timeout=30
9771
cd -
9872
- name: Run examples
99-
# export PATH=$CONDA_ROOT/condabin:$CONDA_ROOT/bin:${PATH}
100-
# eval "$($CONDA_ROOT/bin/python -m conda shell.bash hook)"
10173
run: |
10274
conda activate sharpy
10375
cd examples

0 commit comments

Comments
 (0)