Skip to content

Commit c89d397

Browse files
committed
[CI] Remove PYTHON_VERSION
Python version is already specified in `Pipfile`.
1 parent 9dc5d23 commit c89d397

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

.gitlab-ci.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
# GENERAL
44
#-----------------------------------------------------------------------------------------------------------------------
55

6-
variables:
7-
PYTHON_VERSION: "3.10"
8-
96
default:
107
before_script:
118
- >
@@ -133,7 +130,7 @@ build:debug:linux-amd64:
133130
- .shared
134131
- .build_cache
135132
script:
136-
- pipenv --python $PYTHON_VERSION sync
133+
- pipenv sync
137134
- pipenv run cmake -S . -B build/${BUILD_TYPE}
138135
--fresh
139136
-G Ninja
@@ -164,7 +161,7 @@ build:debug:macos-amd64:
164161
- .shared
165162
- .build_cache
166163
script:
167-
- pipenv --python $PYTHON_VERSION sync
164+
- pipenv sync
168165
- pipenv run cmake -S . -B build/${BUILD_TYPE}
169166
--fresh
170167
-G Ninja
@@ -199,7 +196,7 @@ unittest:linux-amd64:
199196
- job: "build:debug:linux-amd64"
200197
artifacts: true
201198
script:
202-
- pipenv --python $PYTHON_VERSION sync
199+
- pipenv sync
203200
- env pipenv run utils/unittest-parallel.py -r --out unittest-sanity.xml build/debug/bin/unittest -t '[test-sanity]' || true
204201
- head -n1 unittest-sanity.xml | perl -n -e '/errors="(\d+)" failures="(\d+)" tests="(\d+)/ && exit ($1 != 2 or $2 != 1 or $3 != 2)' # we expect 2 errors (abort & segv), one failure (failure), and two tests run (failure & success)
205202
- env UBSAN_OPTIONS=print_stacktrace=1 ASAN_OPTIONS=detect_stack_use_after_return=1 pipenv run utils/unittest-parallel.py -r --out unittest-results.xml build/debug/bin/unittest
@@ -220,7 +217,7 @@ unittest:macos-amd64:
220217
- job: "build:debug:macos-amd64"
221218
artifacts: true
222219
script:
223-
- pipenv --python $PYTHON_VERSION sync
220+
- pipenv sync
224221
- env pipenv run utils/unittest-parallel.py -r --out unittest-sanity.xml build/debug/bin/unittest -t '[test-sanity]' || true
225222
- head -n1 unittest-sanity.xml | perl -n -e '/errors="(\d+)" failures="(\d+)" tests="(\d+)/ && exit ($1 != 2 or $2 != 1 or $3 != 2)' # we expect 2 errors (abort & segv), one failure (failure), and two tests run (failure & success)
226223
- env UBSAN_OPTIONS=print_stacktrace=1 ASAN_OPTIONS=detect_stack_use_after_return=1:detect_container_overflow=0 MallocNanoZone=0 pipenv run utils/unittest-parallel.py -r --out unittest-results.xml build/debug/bin/unittest
@@ -241,7 +238,7 @@ integrationtest:linux-amd64:
241238
- job: "build:debug:linux-amd64"
242239
artifacts: true
243240
script:
244-
- pipenv --python $PYTHON_VERSION sync
241+
- pipenv sync
245242
- env UBSAN_OPTIONS=print_stacktrace=1 ASAN_OPTIONS=detect_stack_use_after_return=1 --unset=TERM pipenv run test/IntegrationTest.py --required-only --debug --builddir build/debug
246243

247244
integrationtest:macos-amd64:
@@ -253,7 +250,7 @@ integrationtest:macos-amd64:
253250
- job: "build:debug:macos-amd64"
254251
artifacts: true
255252
script:
256-
- pipenv --python $PYTHON_VERSION sync
253+
- pipenv sync
257254
- env UBSAN_OPTIONS=print_stacktrace=1 ASAN_OPTIONS=detect_stack_use_after_return=1:detect_container_overflow=0 MallocNanoZone=0 --unset=TERM pipenv run test/IntegrationTest.py --required-only --debug --builddir build/debug
258255

259256
ensure-exported-symbols:debug:linux:
@@ -402,7 +399,7 @@ benchmark-test:release:linux-amd64:
402399
- wget 'https://github.com/duckdb/duckdb/releases/download/v0.10.2/duckdb_cli-linux-amd64.zip'
403400
- unzip 'duckdb_cli-linux-amd64.zip' -d 'benchmark/database_connectors/'
404401
# Run benchmarks
405-
- pipenv --python $PYTHON_VERSION sync
402+
- pipenv sync
406403
- env pipenv run benchmark/Benchmark.py -v -b mutable -o dummy.csv benchmark/dummy
407404
# Validate results
408405
- cat dummy.csv | perl -n -e '/dummy,Dummy,(.*),Execution Time/ && print "$1\n"' | sort | uniq > names.txt # collect system names

0 commit comments

Comments
 (0)