From 5e37d1da65a8d59155a06f32694d2a87025bbcfc Mon Sep 17 00:00:00 2001 From: dwn1c21 <d.newbrook@soton.ac.uk> Date: Wed, 5 Jul 2023 15:24:57 +0000 Subject: [PATCH] CI Update paths with environment variable --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2ac767..bd1dc50 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,9 +45,9 @@ build-job-Z2: # This job runs in the build stage, which runs first. - git submodule foreach --recursive git submodule init - git fetch --recurse-submodules - source set_env.sh - - cd ./nanosoc_tech/fpga/ + - cd $SOCLABS_NANOSOC_TECH_DIR/fpga/ - make build_fpga FPGA=z2 - - FILE=../../imp/fpga/output/pynq_z2/overlays/nanosoc_design.bit + - FILE=$SOCLABS_DESIGN_ROOT/imp/fpga/output/pynq_z2/overlays/nanosoc_design.bit - if test -f "$FILE"; then - echo "Build successful" - else @@ -69,9 +69,9 @@ build-job-ZCU104: # This job runs in the build stage, which runs first. - git submodule foreach --recursive git submodule init - git fetch --recurse-submodules - source set_env.sh - - cd ./nanosoc_tech/fpga + - cd $SOCLABS_NANOSOC_TECH_DIR/fpga - make build_fpga FPGA=zcu104 - - FILE=../../imp/fpga/output/pynq_zcu104/overlays/nanosoc_design.bit + - FILE=$SOCLABS_DESIGN_ROOT/imp/fpga/output/pynq_zcu104/overlays/nanosoc_design.bit - if test -f "$FILE"; then - echo "Build successful" - else -- GitLab