Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent absolute links from adoc to www.jenkins.io and jenkins.io #5899

Merged
merged 14 commits into from
Jan 21, 2023
Merged

Prevent absolute links from adoc to www.jenkins.io and jenkins.io #5899

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
64f11c1
Check adoc for hard-coded jenkins.io references
MarkEWaite Jan 9, 2023
1c45ff8
Merge branch 'master' into reject-hard-coded-URL-references
MarkEWaite Jan 10, 2023
d4db0b6
Merge branch 'master' into reject-hard-coded-URL-references
MarkEWaite Jan 10, 2023
185fbf8
Never fail new check on trusted
MarkEWaite Jan 10, 2023
bfc2abe
Merge branch 'master' into reject-hard-coded-URL-references
MarkEWaite Jan 10, 2023
27274e3
Merge branch 'master' into reject-hard-coded-URL-references
MarkEWaite Jan 10, 2023
f9472d3
Do not run `make check` when deploying (trusted.ci)
MarkEWaite Jan 10, 2023
d67b1ba
Make checks and deploy more consistent
MarkEWaite Jan 10, 2023
1c3a5ea
Merge branch 'master' into reject-hard-coded-URL-references
MarkEWaite Jan 10, 2023
09c77e1
Merge branch 'master' into reject-hard-coded-URL-references
MarkEWaite Jan 11, 2023
c54182b
Merge branch 'master' into reject-hard-coded-URL-references
MarkEWaite Jan 12, 2023
6f6f91a
Merge branch 'master' into reject-hard-coded-URL-references
dduportal Jan 14, 2023
4ebd8f5
Merge branch 'master' into reject-hard-coded-URL-references
MarkEWaite Jan 17, 2023
2f2c48e
Merge branch 'master' into reject-hard-coded-URL-references
MarkEWaite Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Do not run make check when deploying (trusted.ci) 
The checks performed by `make check` are advisory.  Advisory checks
should not stop a deployment from trusted.ci.jenkins.io.
  • Loading branch information
@MarkEWaite
MarkEWaite committed Jan 10, 2023
commit f9472d3be8b00667c604b7d73941786a659edbc0
7 changes: 5 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,11 @@ node('docker&&linux') {
}

stage('Check for typos') {
sh 'make check'
recordIssues(tools: [checkStyle(id: 'typos', name: 'Typos', pattern: 'checkstyle.xml')], qualityGates: [[threshold: 1, type: 'TOTAL', unstable: true]])
if (!infra.isTrusted()) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inconsistent with

jenkins.io/Jenkinsfile

Line 92 in f9472d3

if (env.BRANCH_NAME == null) {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Included in d67b1ba with a comment to clarify why two conditions are being checked.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@daniel-beck does the change in d67b1ba address your concerns enough that this can be merged or are more changes required?

sh 'make check'
recordIssues(tools: [checkStyle(id: 'typos', name: 'Typos', pattern: 'checkstyle.xml')],
qualityGates: [[threshold: 1, type: 'TOTAL', unstable: true]])
}
}

stage('Build site') {
Expand Down
4 changes: 0 additions & 4 deletions scripts/check-hard-coded-URL-references
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,4 @@ if [ "$files" != "" ]; then
return_code=$(( return_code + 2 ))
fi

if [[ "${BUILD_URL}" =~ "trusted.ci.jenkins.io" ]]; then
exit 0
fi

exit $return_code