From 87c2c5749786a52b7dd306a1d1dcf8c807d54fde Mon Sep 17 00:00:00 2001 From: Boris Yakobowski Date: Thu, 31 Oct 2024 17:28:28 +0000 Subject: [PATCH] Simplify CI file Remove use of 'sandbox' image. While doing so, simplify the CI. For it/gitlab-ci-images#52 --- .adacore-gitlab-ci.yml | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/.adacore-gitlab-ci.yml b/.adacore-gitlab-ci.yml index 9f70bcaf..e99a7a17 100644 --- a/.adacore-gitlab-ci.yml +++ b/.adacore-gitlab-ci.yml @@ -1,24 +1,5 @@ -workflow: - rules: - - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - -anod_build: - services: - - image:sandbox - - cpu:8 - - mem:16 - stage: build - script: - - export ANOD_DEFAULT_SANDBOX_DIR=/it/wave - - # Check out QSYM - - cd runtime/qsym_backend - - git clone -b symcc https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/eng/fuzz/qsym - - # Use our repositories - - anod vcs --add-repo symcc $CI_PROJECT_DIR - - anod vcs --add-repo qsym $CI_PROJECT_DIR/runtime/qsym_backend/qsym - - # Build SymCC - - anod source symcc - - anod build symcc +include: + - component: $CI_SERVER_FQDN/eng/gitlab-templates/build@~latest + inputs: + anod-args: build symcc + generic-anod-ci-args: --add-dep eng/fuzz/qsym