Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
web-et-numerique
Factory
Resin
Server
Commits
a222df24
Commit
a222df24
authored
2 years ago
by
Hugo SUBTIL
Browse files
Options
Downloads
Patches
Plain Diff
fix: sonar
parent
7e8f2912
No related branches found
Branches containing commit
Tags
v3.0.1
Tags containing commit
2 merge requests
!177
1.17.0
,
!145
fix: sonar
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+50
-37
50 additions, 37 deletions
.gitlab-ci.yml
src/shared/utils.ts
+1
-1
1 addition, 1 deletion
src/shared/utils.ts
with
51 additions
and
38 deletions
.gitlab-ci.yml
+
50
−
37
View file @
a222df24
stages
:
-
quality
-
test
-
sonar-analysis
-
build
-
deploy
...
...
@@ -38,10 +38,8 @@ build_branch:
DOCKER_DRIVER
:
overlay2
image
:
${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:18.09
stage
:
build
except
:
-
master
-
rec
-
dev
only
:
-
merge_requests
script
:
-
docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-
docker build --pull -t "$CI_REGISTRY_IMAGE/feat:$CI_COMMIT_REF_SLUG" --build-arg conf=prod .
...
...
@@ -104,39 +102,54 @@ test:
-
dev
-
merge_requests
# code_analysis:
# image: registry.forge.grandlyon.com/apoyen2/sonnar-scanner-gl:master
# services:
# - docker:18.09-dind
# stage: sonar-analysis
# only:
# - dev
# - merge_requests
# before_script:
# - export NODE_PATH=$NODE_PATH:`npm root -g`
# - npm install -g typescript
# script:
# - >
# sonar-scanner
# -Dsonar.projectName=${SONAR_PROJECT_KEY}
# -Dsonar.projectVersion=1.0
# -Dsonar.sourceEncoding=UTF-8
# -Dsonar.projectBaseDir=.
# -Dsonar.host.url=${SONAR_URL}
# -Dsonar.projectKey=${SONAR_PROJECT_KEY}
# -Dsonar.exclusions=scripts/**,**/*mock.*.ts,**/*spec.ts
# -Dsonar.login=${SONAR_TOKEN}
# -Dsonar.qualitygate.wait=true
mr
:
sonarqube
:
stage
:
quality
only
:
-
dev
image
:
${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/sonarsource/sonar-scanner-cli:4
variables
:
DOCKER_TLS_CERTDIR
:
'
'
DOCKER_HOST
:
tcp://docker:2375/
DOCKER_DRIVER
:
overlay2
image
:
${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:18.09
stage
:
build
SONAR_USER_HOME
:
'
${CI_PROJECT_DIR}/.sonar'
# Defines the location of the analysis task cache
GIT_DEPTH
:
'
0'
# T
cache
:
key
:
'
${CI_JOB_NAME}'
paths
:
-
.sonar/cache
script
:
-
>
sonar-scanner
-Dsonar.projectName=${SONAR_PROJECT_KEY}
-Dsonar.projectVersion=1.0
-Dsonar.sourceEncoding=UTF-8
-Dsonar.projectBaseDir=.
-Dsonar.host.url=${SONAR_URL}
-Dsonar.projectKey=${SONAR_PROJECT_KEY}
-Dsonar.login=${SONAR_TOKEN}
-Dsonar.cpd.exclusions=test/**,scripts/**,src/**/*.spec.ts*
-Dsonar.exclusions=test/**,scripts/**,src/**/*.spec.ts*,src/migrations/scripts/**
-Dsonar.qualitygate.wait=true
sonarqube-mr
:
stage
:
quality
only
:
-
merge_requests
image
:
${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/sonarsource/sonar-scanner-cli:4
variables
:
SONAR_USER_HOME
:
'
${CI_PROJECT_DIR}/.sonar'
# Defines the location of the analysis task cache
GIT_DEPTH
:
'
0'
# T
cache
:
key
:
'
${CI_JOB_NAME}'
paths
:
-
.sonar/cache
script
:
-
docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-
docker build .
-
>
sonar-scanner
-Dsonar.projectName=${SONAR_PROJECT_KEY}
-Dsonar.projectVersion=1.0
-Dsonar.sourceEncoding=UTF-8
-Dsonar.projectBaseDir=.
-Dsonar.host.url=${SONAR_URL}
-Dsonar.projectKey=${SONAR_PROJECT_KEY}
-Dsonar.login=${SONAR_MR_TOKEN}
-Dsonar.cpd.exclusions=test/**,scripts/**,src/**/*.spec.ts*
-Dsonar.exclusions=test/**,scripts/**,src/**/*.spec.ts*,src/migrations/scripts/**
-Dsonar.qualitygate.wait=true
This diff is collapsed.
Click to expand it.
src/shared/utils.ts
+
1
−
1
View file @
a222df24
...
...
@@ -10,7 +10,7 @@ export function rewriteGhostImgUrl(configService: ConfigurationService, itemData
itemData
.
feature_image
.
split
(
'
/content
'
)[
1
]
}
`
;
}
const
regex
=
/
(
https
?
:
\/\/
ghost
)
:
(\d
*
)?
/g
;
const
regex
=
/
(
https
?
:
\/\/
ghost
)
:
(\d
*
)?
/g
;
//NOSONAR
itemData
.
html
=
itemData
.
html
.
replace
(
regex
,
`https://
${
configService
.
config
.
host
}
/blog`
);
}
return
itemData
;
...
...
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
register
or
sign in
to comment