Skip to content

Commit a579c2a

Browse files
committed
Add concurrency rules
1 parent a156236 commit a579c2a

File tree

2 files changed

+32
-17
lines changed

2 files changed

+32
-17
lines changed

.github/workflows/micromamba.yml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
matrix:
2525
ob_branch: [dev, reduce_install_scope, main]
2626
micromamba_version: ['2.0.5-0', '1.5.12-0']
27-
fail-fast: true
27+
fail-fast: false
2828
steps:
2929
- name: Check out repository
3030
uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
cache-environment: true
3737
micromamba-version: ${{ matrix.micromamba_version }}
38-
environment-name: test-env
38+
environment-name: test-env-${{matrix.ob_branch }}-${{ matrix.micromamba_version }}
3939
create-args: >-
4040
python=3.12
4141
pip
@@ -56,18 +56,25 @@ jobs:
5656
- name: Run benchmark
5757
shell: bash -l {0}
5858
run: |
59-
date
60-
echo "y" | ob run benchmark -b Clustering.yaml --local --cores 10 --continue-on-error
61-
date
59+
env
60+
output=$( echo "y" | ob run benchmark -b Clustering.yaml --local --cores 10 2>&1 )
61+
status=$?
62+
if echo "$output" | grep -v 'Error'; then
63+
status=0
64+
fi
65+
sh -c "exit $status"
6266
if: matrix.ob_branch == 'dev' || matrix.ob_branch == 'reduce_install_scope'
6367

6468
- name: Run benchmark
6569
shell: bash -l {0}
66-
continue-on-error: true
6770
run: |
68-
date
69-
ob run benchmark -b Clustering.yaml --local --threads 10
70-
date
71+
env
72+
output=$( ob run benchmark -b Clustering.yaml --local --threads 10 2>&1 )
73+
status=$?
74+
if echo "$output" | grep -v 'Error'; then
75+
status=0
76+
fi
77+
sh -c "exit $status"
7178
if: matrix.ob_branch == 'main'
7279

7380
# upload-artifact:

.github/workflows/miniconda_miniforge.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: clustbench_miniforge
22
concurrency:
3-
group: ${{ github.head_ref || github.run_id }}
3+
group: ${{ github.head_ref || github.run_id }}
44
cancel-in-progress: true
55

66
on:
@@ -33,7 +33,7 @@ jobs:
3333
with:
3434
miniforge-variant: Miniforge3
3535
use-mamba: true
36-
activate-environment: omnibenchmark-env
36+
activate-environment: test-env-${{matrix.ob_branch }}
3737
python-version: "3.12"
3838
auto-update-conda: true
3939
channels: conda-forge
@@ -66,17 +66,25 @@ jobs:
6666
- name: Run benchmark
6767
shell: bash -l {0}
6868
run: |
69-
date
70-
echo "y" | ob run benchmark -b Clustering.yaml --local --cores 10 --continue-on-error
71-
date
69+
env
70+
output=$( echo "y" | ob run benchmark -b Clustering.yaml --local --cores 10 2>&1 )
71+
status=$?
72+
if echo "$output" | grep -v 'Error'; then
73+
status=0
74+
fi
75+
sh -c "exit $status"
7276
if: matrix.ob_branch == 'dev' || matrix.ob_branch == 'reduce_install_scope'
7377

7478
- name: Run benchmark
7579
shell: bash -l {0}
7680
run: |
77-
date
78-
ob run benchmark -b Clustering.yaml --local --threads 10
79-
date
81+
env
82+
output=$( ob run benchmark -b Clustering.yaml --local --threads 10 2>&1 )
83+
status=$?
84+
if echo "$output" | grep -v 'Error'; then
85+
status=0
86+
fi
87+
sh -c "exit $status"
8088
if: matrix.ob_branch == 'main'
8189

8290
# upload-artifact:

0 commit comments

Comments
 (0)