Skip to content

Commit

Permalink
Merge pull request #201 from ipbus/thea/ci-vivado-2020
Browse files Browse the repository at this point in the history
Switching CI jobs from vivado 2018.3 to 2020.2
  • Loading branch information
alessandrothea authored Sep 27, 2021
2 parents 481a332 + c33fc64 commit bdf83a2
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 35 deletions.
42 changes: 21 additions & 21 deletions ci/vivado-builds.yml
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
build:kc705_basex__2018.3:
build:kc705_basex__2020.2:
extends: .template_vivado_build
variables:
VIVADO_VERSION: "2018.3"
VIVADO_VERSION: "2020.2"
dependencies:
- quick_check:kc705_basex__2018.3
- quick_check:kc705_basex__2020.2
build:kc705_basex__2019.2:
extends: .template_vivado_build
variables:
VIVADO_VERSION: "2019.2"
dependencies:
- quick_check:kc705_basex__2019.2

build:kc705_gmii__2018.3:
build:kc705_gmii__2020.2:
extends: .template_vivado_build
variables:
VIVADO_VERSION: "2018.3"
VIVADO_VERSION: "2020.2"
dependencies:
- quick_check:kc705_gmii__2018.3
- quick_check:kc705_gmii__2020.2
build:kc705_gmii__2019.2:
extends: .template_vivado_build
variables:
VIVADO_VERSION: "2019.2"
dependencies:
- quick_check:kc705_gmii__2019.2

build:kcu105_basex__2018.3:
build:kcu105_basex__2020.2:
extends: .template_vivado_build
variables:
VIVADO_VERSION: "2018.3"
VIVADO_VERSION: "2020.2"
dependencies:
- quick_check:kcu105_basex__2018.3
- quick_check:kcu105_basex__2020.2
build:kcu105_basex__2019.2:
extends: .template_vivado_build
variables:
VIVADO_VERSION: "2019.2"
dependencies:
- quick_check:kcu105_basex__2019.2

build:zcu102_basex__2018.3:
build:zcu102_basex__2020.2:
extends: .template_vivado_build
variables:
VIVADO_VERSION: "2018.3"
VIVADO_VERSION: "2020.2"
dependencies:
- quick_check:zcu102_basex__2018.3
- quick_check:zcu102_basex__2020.2
build:zcu102_basex__2019.2:
extends: .template_vivado_build
variables:
Expand All @@ -57,38 +57,38 @@ build:zcu102_basex__2019.2:
# dependencies:
# - quick_check:zcu102_c2c_loopback__2019.2

build:k800__2018.3:
build:k800__2020.2:
extends: .template_vivado_build
variables:
VIVADO_VERSION: "2018.3"
VIVADO_VERSION: "2020.2"
dependencies:
- quick_check:k800__2018.3
- quick_check:k800__2020.2
build:k800__2019.2:
extends: .template_vivado_build
variables:
VIVADO_VERSION: "2019.2"
dependencies:
- quick_check:k800__2019.2

build:vcu118_pcie__2018.3:
build:vcu118_pcie__2020.2:
extends: .template_vivado_build
variables:
VIVADO_VERSION: "2018.3"
VIVADO_VERSION: "2020.2"
dependencies:
- quick_check:vcu118_pcie__2018.3
- quick_check:vcu118_pcie__2020.2
build:vcu118_pcie__2019.2:
extends: .template_vivado_build
variables:
VIVADO_VERSION: "2019.2"
dependencies:
- quick_check:vcu118_pcie__2019.2

build:vcu118_sgmii__2018.3:
build:vcu118_sgmii__2020.2:
extends: .template_vivado_build
variables:
VIVADO_VERSION: "2018.3"
VIVADO_VERSION: "2020.2"
dependencies:
- quick_check:vcu118_sgmii__2018.3
- quick_check:vcu118_sgmii__2020.2
build:vcu118_sgmii__2019.2:
extends: .template_vivado_build
variables:
Expand Down
28 changes: 14 additions & 14 deletions ci/vivado-checks.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
quick_check:kc705_basex__2018.3:
quick_check:kc705_basex__2020.2:
extends: .template_vivado_quick_check
variables:
VIVADO_VERSION: "2018.3"
VIVADO_VERSION: "2020.2"
PROJ: kc705_basex
quick_check:kc705_basex__2019.2:
extends: .template_vivado_quick_check
variables:
VIVADO_VERSION: "2019.2"
PROJ: kc705_basex

quick_check:kc705_gmii__2018.3:
quick_check:kc705_gmii__2020.2:
extends: .template_vivado_quick_check
variables:
VIVADO_VERSION: "2018.3"
VIVADO_VERSION: "2020.2"
PROJ: kc705_gmii
quick_check:kc705_gmii__2019.2:
extends: .template_vivado_quick_check
variables:
VIVADO_VERSION: "2019.2"
PROJ: kc705_gmii

quick_check:kcu105_basex__2018.3:
quick_check:kcu105_basex__2020.2:
extends: .template_vivado_quick_check
variables:
VIVADO_VERSION: "2018.3"
VIVADO_VERSION: "2020.2"
PROJ: kcu105_basex
quick_check:kcu105_basex__2019.2:
extends: .template_vivado_quick_check
variables:
VIVADO_VERSION: "2019.2"
PROJ: kcu105_basex

quick_check:zcu102_basex__2018.3:
quick_check:zcu102_basex__2020.2:
extends: .template_vivado_quick_check
variables:
VIVADO_VERSION: "2018.3"
VIVADO_VERSION: "2020.2"
PROJ: zcu102_basex
quick_check:zcu102_basex__2019.2:
extends: .template_vivado_quick_check
Expand All @@ -48,32 +48,32 @@ quick_check:zcu102_c2c_loopback__2019.2:
VIVADO_VERSION: "2019.2"
PROJ: zcu102_c2c_loopback

quick_check:k800__2018.3:
quick_check:k800__2020.2:
extends: .template_vivado_quick_check
variables:
VIVADO_VERSION: "2018.3"
VIVADO_VERSION: "2020.2"
PROJ: k800
quick_check:k800__2019.2:
extends: .template_vivado_quick_check
variables:
VIVADO_VERSION: "2019.2"
PROJ: k800

quick_check:vcu118_pcie__2018.3:
quick_check:vcu118_pcie__2020.2:
extends: .template_vivado_quick_check
variables:
VIVADO_VERSION: "2018.3"
VIVADO_VERSION: "2020.2"
PROJ: vcu118_pcie
quick_check:vcu118_pcie__2019.2:
extends: .template_vivado_quick_check
variables:
VIVADO_VERSION: "2019.2"
PROJ: vcu118_pcie

quick_check:vcu118_sgmii__2018.3:
quick_check:vcu118_sgmii__2020.2:
extends: .template_vivado_quick_check
variables:
VIVADO_VERSION: "2018.3"
VIVADO_VERSION: "2020.2"
PROJ: vcu118_sgmii
quick_check:vcu118_sgmii__2019.2:
extends: .template_vivado_quick_check
Expand Down

0 comments on commit bdf83a2

Please sign in to comment.