Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
EMP CI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cms-tracker-phase2-backend-systems
Back End Firmware
EMP CI
Merge requests
!5
Increment vivado version
Code
Review changes
Check out branch
Download
Patches
Plain diff
Closed
Increment vivado version
dmonk-master-patch-34302
into
master
Overview
0
Commits
1
Pipelines
2
Changes
1
Closed
David Gabriel Monk
requested to merge
dmonk-master-patch-34302
into
master
3 years ago
Overview
0
Commits
1
Pipelines
2
Changes
1
Expand
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
067b3c20
1 commit,
3 years ago
1 file
+
1
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Conflict: This file was modified in both the source and target branches. Ask someone with write access to resolve it.
.gitlab-ci.yml
+
1
−
1
Options
@@ -2,7 +2,7 @@ include:
-
local
:
"
/ci/templates/vivado-jobs.yml"
variables
:
VIVADO_VER
:
"
202
0.2
"
VIVADO_VER
:
"
202
1.1
"
PROJECT_ALGORITHM
:
"
projects/examples/serenity/dc_ku15p"
PROJECT_DEPFILE
:
"
sm1_v2/top_min.dep"
BUILD_REPO
:
"
emp-fwk"
Loading