Commit 55718f4f authored by Jaco Hofmann's avatar Jaco Hofmann
Browse files

Removes import as dependency for compose

parent 89b6f957
Pipeline #123 failed with stages
in 9 minutes and 46 seconds
......@@ -28,12 +28,10 @@ sbt-prepare:
stage: toolchain-test
artifacts:
expire_in: 1 hrs
paths:
- artifact.tgz
untracked: true
script:
- sbt assembly
- cd $TAPASCO_HOME/common/ip/tapasco_status && ./chiselSetup.sh
- tar cvfz artifact.tgz .ivy2 .sbt bin target
.hls-template: &hls-definition
stage: hls
......@@ -43,8 +41,6 @@ sbt-prepare:
untracked: true
expire_in: 1 hrs
script:
- tar xvfz artifact.tgz
- rm artifact.tgz
- source /opt/cad/$VIVADO_OFFSET/settings64.sh
- tapasco hls arraysum, arrayupdate
......@@ -77,8 +73,6 @@ hls-2017.1:
dependencies:
- sbt-prepare
script:
- tar xvfz artifact.tgz
- rm artifact.tgz
- source /opt/cad/$VIVADO_OFFSET/settings64.sh
- cd $TAPASCO_HOME/common/ip && zip -r precision_counter.zip precision_counter*
- tapasco import $TAPASCO_HOME/common/ip/precision_counter.zip as 14
......@@ -116,7 +110,6 @@ import-2017.1:
compose-2017.4:
dependencies:
- hls-2017.4
- import-2017.4
variables:
VIVADO_VERSION: "2017.4"
VIVADO_OFFSET: "xilinx/vivado/Vivado/$VIVADO_VERSION/"
......@@ -125,7 +118,6 @@ compose-2017.4:
compose-2017.3:
dependencies:
- hls-2017.3
- import-2017.3
variables:
VIVADO_VERSION: "2017.3"
VIVADO_OFFSET: "xilinx/vivado/Vivado/$VIVADO_VERSION/"
......@@ -134,7 +126,6 @@ compose-2017.3:
compose-2017.2:
dependencies:
- hls-2017.2
- import-2017.2
variables:
VIVADO_VERSION: "2017.2"
VIVADO_OFFSET: "xilinx/vivado/Vivado/$VIVADO_VERSION/"
......@@ -143,7 +134,6 @@ compose-2017.2:
compose-2017.1:
dependencies:
- hls-2017.1
- import-2017.1
variables:
VIVADO_VERSION: "2017.1"
VIVADO_OFFSET: "xilinx/vivado/Vivado/$VIVADO_VERSION/"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment