Skip to content

Commit 2edcfc9

Browse files
committed
Fix gitlab test node
Add fingerprints file, so anod does not try to reinstall gnatcoll-core which is manually installed with tar at the beginning of the test stage. Also add the "external" qualifier to test. Otherwise, the gnatcoll-core lib internal to the compiler is used instead. Change-Id: I2b3141b4c72570521738552e0573544f2b42e8f1
1 parent 5769ea6 commit 2edcfc9

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

.gitlab-ci.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,19 @@ test:
4141
script:
4242
# unpack the packages
4343
- cd $ANOD_DEFAULT_SANDBOX_DIR
44+
- mkdir -p fingerprints
4445
- mkdir -p $HOST/gnatcoll-core-current
4546
- tar zxf $CI_PROJECT_DIR/gnatcoll-core-current.tar.gz -C $HOST/gnatcoll-core-current
47+
- touch fingerprints/$HOST.gnatcoll-core-current.install.json.assume-unchanged
48+
- touch fingerprints/$HOST.gnatcoll-core-current.download-bin.json.assume-unchanged
49+
4650
- rm -f $CI_PROJECT_DIR/*.tar.gz
4751

4852
- anod vcs --add-repo gnatcoll-core $CI_PROJECT_DIR
4953

50-
- anod test --latest gnatcoll-core
54+
# -Qexternal is required to use the version built outside the compiler during
55+
# the build stage.
56+
- anod test --latest gnatcoll-core -Qexternal
5157
- e3-testsuite-report
5258
--failure-exit-code 1
5359
--xunit-output $CI_PROJECT_DIR/test.xml

0 commit comments

Comments
 (0)