Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Submit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIP
Labrador
Submit
Commits
ac0428fa
Commit
ac0428fa
authored
Feb 11, 2021
by
Otto Visser
Browse files
Options
Downloads
Plain Diff
Merge branch 'development' into 'master'
Development See merge request
!73
parents
d6e60589
291d27ea
No related branches found
Tags
Tags containing commit
1 merge request
!73
Development
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
.gitlab-ci.yml
+14
-14
14 additions, 14 deletions
.gitlab-ci.yml
with
14 additions
and
14 deletions
.gitlab-ci.yml
+
14
−
14
View file @
ac0428fa
...
...
@@ -187,7 +187,7 @@ include:
-
template
:
Security/License-Scanning.gitlab-ci.yml
-
template
:
Security/Secret-Detection.gitlab-ci.yml
-
template
:
Verify/Accessibility.gitlab-ci.yml
-
template
:
Verify/Browser-Performance.gitlab-ci.yml
#
- template: Verify/Browser-Performance.gitlab-ci.yml
# Runs the code quality reporter
...
...
@@ -247,19 +247,19 @@ a11y:
ally_urls
:
"
https://submit.tudelft.nl"
# Accessibility testing
performance
:
extends
:
-
.gitlab_reporter
rules
:
-
if
:
$CI_PIPELINE_SOURCE == "trigger" ||
$CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
when
:
never
-
if
:
$CI_COMMIT_BRANCH == "master" ||
$CI_COMMIT_BRANCH == "development"
when
:
manual
stage
:
gitlab reports
variables
:
URL
:
"
https://submit.tudelft.nl"
#
performance:
#
extends:
#
- .gitlab_reporter
#
rules:
#
- if: $CI_PIPELINE_SOURCE == "trigger" ||
#
$CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
#
when: never
#
- if: $CI_COMMIT_BRANCH == "master" ||
#
$CI_COMMIT_BRANCH == "development"
#
when: manual
#
stage: gitlab reports
#
variables:
#
URL: "https://submit.tudelft.nl"
# Run the container scanning security checks.
# Currently set to manual because we do not believe it adds anything to the current
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment