From 2f887ff5775acb3246cf3d6e978f7a51bb17e940 Mon Sep 17 00:00:00 2001 From: FPK Date: Thu, 26 Aug 2021 15:11:39 +0000 Subject: [PATCH] * build fpts2junit after testing so all directories are present (cherry picked from commit 683e5b873b5c7d00f56fd9178ffc3656dfb4b89a) --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1907f0dcb..9bff62d20d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,11 +15,10 @@ build-and-test-job: # This job runs in the build stage, which runs first. - FPC_SRC=$(pwd) - FPC_COMPILER=$FPC_SRC/compiler/ppcx64 - cd tests - - cd utils - - make fpts2junit - - cd .. - make clean TEST_FPC=$FPC_COMPILER TEST_DELTEMP=1 -j 4 - make full TEST_FPC=$FPC_COMPILER TEST_DELTEMP=1 -j 4 + - cd utils + - make fpts2junit - cd $FPC_SRC - tests/utils/fpts2junit $FPC_SRC/tests/output/x86_64-linux/ testresult.xml artifacts: