From 7489ead5f39833b19141223c1435e2cc8b16f8b5 Mon Sep 17 00:00:00 2001 From: Jens Steidl <Jens.Steidl@slub-dresden.de> Date: Thu, 28 Sep 2023 18:04:59 +0200 Subject: [PATCH] - refator: use a global path variable --- .gitlab-ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec20582..01dbeeb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ variables: VERAPDF_VERSION: "1.24.1" DOCKERFILE_DEB: "${CI_PROJECT_DIR}/gitlab-ci/Dockerfile_DEB" IMAGE_TARGET_DEB: "${CI_REGISTRY_IMAGE}/debian12_verapdf_build_env" + INSTALL_PATH_DEB: "/usr/local/verapdf" stages: # List of stages for jobs, and their order of execution - build-env @@ -52,8 +53,6 @@ local-install-debian-job: # This job runs in the test stage. - "docker" image: name: "${IMAGE_TARGET_DEB}:latest" - variables: - INSTALL_PATH_DEB: "/usr/local/verapdf" script: # download zipped verapdf installer # HINT: https://software.verapdf.org/rel/1.24/verapdf-greenfield-1.24.1-installer.zip @@ -71,7 +70,7 @@ local-install-debian-job: # This job runs in the test stage. # run headless verapdf installation - "${VERAPDF_UNZIP_DIR}/verapdf-install" "${AUTO_INSTALL_XML_PATH}" # test call verapdf - - /usr/local/verapdf/verapdf --version | grep "${VERAPDF_VERSION}" + - "${INSTALL_PATH_DEB}/verapdf" --version | grep "${VERAPDF_VERSION}" package-debian-job: stage: package @@ -116,4 +115,4 @@ test-install-debian-job: - "docker" script: - apt install -y ./verapdf*.deb - - /usr/local/verapdf/verapdf --version | grep '${VERAPDF_VERSION}' \ No newline at end of file + - "${INSTALL_PATH_DEB}/verapdf" --version | grep "${VERAPDF_VERSION}" -- GitLab