Skip to content

Commit 630ce53

Browse files
committed
Inserted gvsoc build in CI
1 parent ed91277 commit 630ce53

3 files changed

Lines changed: 66 additions & 3 deletions

File tree

.gitlab-ci.yml

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,21 @@ variables:
1313
stages:
1414
- clone
1515
- build
16+
- run
1617

1718

1819
.python:
1920
before_script:
2021
# Cloning MAGIA and recreating Python venv at each job to avoid issues with artifacts
2122
- make python_ci MAGIA_DIR=$MAGIA
2223

24+
.python_gvsoc:
25+
before_script:
26+
- conda create -n magia python=3.12 -y
27+
- source activate base
28+
- conda activate magia
29+
- pip install . -y
30+
2331
.base:
2432
artifacts:
2533
when: always
@@ -34,6 +42,28 @@ clone-magia:
3442
artifacts:
3543
paths: [ "MAGIA" ]
3644

45+
clone-gvsoc:
46+
extends: .base
47+
stage: clone
48+
script:
49+
- make gvsoc_init
50+
artifacts:
51+
paths: [ "gvsoc" ]
52+
53+
.gvsoc:
54+
extends: [.base, .python_gvsoc]
55+
script:
56+
- make gvsoc tiles=${tiles}
57+
58+
gvsoc_tiles_2:
59+
extends: .gvsoc
60+
stage: build
61+
needs:
62+
- job: clone-gvsoc
63+
artifacts: true
64+
variables:
65+
tiles: 2
66+
3767

3868
.MAGIA:
3969
extends: [.base, .python]
@@ -70,4 +100,5 @@ build_test_magiav2_tiles_2:
70100
variables:
71101
tiles: 2
72102
target_platform: magia_v2
73-
compiler: GCC_PULP
103+
compiler: GCC_PULP
104+

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ gvsoc_init:
168168
cd $(GVSOC_DIR) && \
169169
git submodule update --init --recursive && \
170170
cd core && \
171-
git checkout lz/magia-v2-core && \
171+
git checkout master && \
172172
cd ../pulp && \
173-
git checkout lz/magia-v2-pulp
173+
git checkout master
174174

175175
python_ci:
176176
cd $(MAGIA_DIR) && \

pyproject.toml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
[build-system]
2+
requires = ["setuptools>=61"]
3+
build-backend = "setuptools.build_meta"
4+
5+
[project]
6+
name = "magia-deployment"
7+
version = "0.1.0"
8+
description = "Deployment on MAGIA platform"
9+
requires-python = ">=3.12"
10+
authors = [
11+
{name="Alex Marchioni", email = "alex.marchioni@outlook.it"},
12+
]
13+
dependencies = [
14+
"numpy",
15+
"prettytable",
16+
"pyelftools",
17+
"rich",
18+
"six",
19+
"pexpect",
20+
"psutil",
21+
"typing_extensions",
22+
"deeploy-pulp",
23+
]
24+
25+
[project.optional-dependencies]
26+
nb = [
27+
"jupyter",
28+
"ipykernel",
29+
]
30+
31+
[tool.setuptools.packages.find]
32+
where = ["."]

0 commit comments

Comments
 (0)