Skip to content

Commit a9aa585

Browse files
authored
Updates in tests and automatic building scripts
1 parent c29a4a4 commit a9aa585

File tree

3 files changed

+87
-10
lines changed

3 files changed

+87
-10
lines changed

.github/workflows/deploy.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,30 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
machine: [x64_linux, arm64_linux]
39+
machine: [x64_linux]
40+
platform: [avx2]
41+
compiler: [g++-13]
4042
leiden: [true]
4143
include:
42-
- machine: x64_mac
43-
leiden: false
44-
- machine: arm64_mac
45-
leiden: false
44+
- {machine: arm64_linux, platform: arm8, compiler: g++-12, leiden: true}
45+
- {machine: x64_mac, platform: avx2, compiler: g++-13, leiden: false}
46+
- {machine: arm64_mac, platform: m1, compiler: g++-13, leiden: false}
4647

47-
runs-on: [self-hosted, vclust, '${{ matrix.machine }}']
48+
runs-on: [self-hosted, vclust, '${{ matrix.machine }}']
49+
env:
50+
DIR: vclust-${{ github.event.release.tag_name }}-${{matrix.machine}}
4851

4952
steps:
5053
- name: make clean
5154
run: make clean
5255
continue-on-error: true
5356
- name: make
54-
run: make -j32 CXX=g++-12 STATIC_LINK=true LEIDEN=${{ matrix.leiden }}
57+
run: make -j32 CXX=${{matrix.compiler}} STATIC_LINK=true PLATFORM=${{ matrix.platform }} LEIDEN=${{ matrix.leiden }}
5558
- name: tar artifacts
56-
run: tar -cvzf vclust.tar.gz vclust.py test.py LICENSE example bin
59+
run: |
60+
mkdir ${DIR}
61+
cp -r vclust.py test.py LICENSE example bin ${DIR}
62+
tar -cvzf vclust.tar.gz ${DIR}
5763
5864
5965
########################################################################################

.github/workflows/self-hosted.yml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: Self-hosted CI
2+
3+
on:
4+
pull_request:
5+
branches: [ master, develop ]
6+
paths-ignore:
7+
- '**.md'
8+
workflow_dispatch:
9+
10+
jobs:
11+
12+
########################################################################################
13+
checkout:
14+
name: Checkout
15+
strategy:
16+
matrix:
17+
machine: [x64_linux, x64_mac, arm64_linux, arm64_mac]
18+
runs-on: [self-hosted, vclust, '${{ matrix.machine }}']
19+
20+
steps:
21+
- uses: actions/checkout@v4
22+
with:
23+
submodules: recursive
24+
- name: Get tags
25+
run: |
26+
cd ./3rd_party/clusty/libs/igraph
27+
git fetch --prune --unshallow
28+
echo exit code $?
29+
git tag --list
30+
continue-on-error: true
31+
32+
########################################################################################
33+
make:
34+
name: Make
35+
needs: checkout
36+
strategy:
37+
fail-fast: false
38+
matrix:
39+
machine: [x64_linux]
40+
platform: [avx2]
41+
compiler: [g++-13]
42+
leiden: [true]
43+
include:
44+
- {machine: arm64_linux, platform: arm8, compiler: g++-12, leiden: true}
45+
- {machine: x64_mac, platform: avx2, compiler: g++-13, leiden: false}
46+
- {machine: arm64_mac, platform: m1, compiler: g++-13, leiden: false}
47+
48+
runs-on: [self-hosted, vclust, '${{ matrix.machine }}']
49+
50+
steps:
51+
- name: make clean
52+
run: make clean
53+
continue-on-error: true
54+
- name: make
55+
run: make -j32 CXX=${{matrix.compiler}} STATIC_LINK=true PLATFORM=${{ matrix.platform }} LEIDEN=${{ matrix.leiden }}
56+
57+
########################################################################################
58+
pipeline:
59+
name: Pipeline
60+
needs: make
61+
strategy:
62+
fail-fast: false
63+
matrix:
64+
machine: [x64_linux, arm64_linux]
65+
runs-on: [self-hosted, vclust, '${{ matrix.machine }}']
66+
67+
steps:
68+
69+
- name: run pipeline
70+
run: |
71+
pytest test.py

vclust.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import typing
1616
import uuid
1717

18-
__version__ = '1.1.0'
18+
__version__ = '1.1.1'
1919

2020
DEFAULT_THREAD_COUNT = min(multiprocessing.cpu_count(), 64)
2121

@@ -1307,4 +1307,4 @@ def main():
13071307
p = run(cmd, args.verbose, logger)
13081308

13091309
if __name__ == '__main__':
1310-
main()
1310+
main()

0 commit comments

Comments
 (0)