Skip to content

Commit f4b445e

Browse files
Merge branch 'fix-internal-ci' into 'main'
GitLab CI: update script, runners, tested versions. See merge request objectbox/objectbox-python!4
2 parents 0caf1cc + 97a301d commit f4b445e

File tree

1 file changed

+26
-22
lines changed

1 file changed

+26
-22
lines changed

.gitlab-ci.yml

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,22 @@ stages:
33
- test
44

55
build:
6+
tags: [x64, docker, linux]
67
image: python:latest
78
stage: build
89
script:
9-
- pip3 install virtualenv
1010
# a function to download a library from another Gitlab repos CI artifacts
11-
- 'download_library(){ curl --create-dirs -o objectbox/lib/$1 -H "PRIVATE-TOKEN: $CI_API_TOKEN" $2; }'
12-
- 'download_library x86_64/libobjectbox.so "${OBXLIB_URL_Linux64}"'
13-
- 'download_library x86_64/libobjectbox.dylib "${OBXLIB_URL_Mac64}"'
14-
- 'download_library armv7l/libobjectbox.so "${OBXLIB_URL_LinuxARMv7hf}"'
15-
- 'download_library armv6l/libobjectbox.so "${OBXLIB_URL_LinuxARMv6hf}"'
16-
- 'download_library AMD64/objectbox.dll "${OBXLIB_URL_Win64}"'
11+
# URLs stored as CI variables, see https://docs.gitlab.com/ee/api/job_artifacts.html#download-a-single-artifact-file-from-specific-tag-or-branch
12+
# FIXME Need to update URLs and extract from archives.
13+
#- 'download_library(){ curl --create-dirs -o objectbox/lib/$1 -H "PRIVATE-TOKEN: $CI_API_TOKEN" $2; }'
14+
#- 'download_library x86_64/libobjectbox.so "${OBXLIB_URL_Linux64}"'
15+
#- 'download_library x86_64/libobjectbox.dylib "${OBXLIB_URL_Mac64}"'
16+
#- 'download_library armv7l/libobjectbox.so "${OBXLIB_URL_LinuxARMv7hf}"'
17+
#- 'download_library armv6l/libobjectbox.so "${OBXLIB_URL_LinuxARMv6hf}"'
18+
#- 'download_library AMD64/objectbox.dll "${OBXLIB_URL_Win64}"'
19+
- python -m pip install --upgrade pip
20+
# Using released C library
21+
- make depend
1722
- make test
1823
- make build
1924
artifacts:
@@ -33,14 +38,6 @@ build:
3338
extends: .test
3439
tags: [x64, docker, linux]
3540

36-
test:linux:x64:3.4:
37-
extends: .test:linux:x64
38-
image: python:3.4
39-
40-
test:linux:x64:3.5:
41-
extends: .test:linux:x64
42-
image: python:3.5
43-
4441
test:linux:x64:3.6:
4542
extends: .test:linux:x64
4643
image: python:3.6
@@ -51,17 +48,24 @@ test:linux:x64:3.7:
5148

5249
test:linux:x64:3.8:
5350
extends: .test:linux:x64
54-
image: python:3.8-rc
51+
image: python:3.8
5552

56-
test:linux:armv6hf:
57-
extends: .test
58-
tags: [armv6hf, docker, linux]
59-
image: balenalib/raspberry-pi-python:3.7-stretch
53+
test:linux:x64:3.9:
54+
extends: .test:linux:x64
55+
image: python:3.9
56+
57+
test:linux:x64:3.10:
58+
extends: .test:linux:x64
59+
image: python:3.10
6060

6161
test:linux:armv7hf:
6262
extends: .test
63-
tags: [armv7hf, docker, linux]
64-
image: python:3.7
63+
tags: [armv7hf, shell, linux, python3]
64+
65+
# aarch64 version not published
66+
#test:linux:aarch64:
67+
# extends: .test
68+
# tags: [aarch64, shell, linux, python3]
6569

6670
test:mac:x64:
6771
extends: .test

0 commit comments

Comments
 (0)