Skip to content

Commit

Permalink
Merge branch 'jenkins-infra:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
lakshmishreea122003 authored Feb 25, 2025
2 parents 7a1512e + 1df8f72 commit 45e89c3
Show file tree
Hide file tree
Showing 30 changed files with 829 additions and 151 deletions.
47 changes: 47 additions & 0 deletions .github/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Configuration for welcome - https://github.com/behaviorbot/welcome
# TODO


# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
# TODO


# Comment to be posted to on first time issues
newIssueWelcomeComment: >
Thanks for opening your first issue for jenkins.io! We appreciate you taking the time to report this issue.
# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome


# Comment to be posted to on PRs from first time contributors in your repository
newPRWelcomeComment: >
Yay, your first pull request towards jenkins.io was created successfully!
Thank you so much!
<br>
<br>
A contributor will provide feedback soon.
Meanwhile, you can join the [chats](https://app.gitter.im/#/room/#jenkins-ci:matrix.org) and [community forums](https://community.jenkins.io/) to connect with other Jenkins users, developers, and maintainers.
# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge


# Comment to be posted to on pull requests merged by a first time user
firstPRMergeComment: >
Congratulations on getting your very first jenkins.io pull request merged 🎉🥳
<br>
<br>
This is a fantastic achievement, and we're thrilled to have you as part of our community!
Thank you for your valuable input, and we look forward to seeing more of your contributions in the future!
<br>
<br>
We would like to invite you to join the [community chats](https://app.gitter.im/#/room/#jenkins-ci:matrix.org) and [forums](https://community.jenkins.io/) to meet other Jenkins contributors 😊
<br>
Don't forget to check out the [participation](https://www.jenkins.io/participate/) page to learn more about how to contribute to Jenkins.
<a href="https://www.jenkins.io/participate/" target="_blank">
<picture>
<img width="600" src="https://raw.githubusercontent.com/jenkins-infra/jenkins.io/master/.github/images/jenkins-welcome.svg">
</picture>
</a>
# It is recommended to include as many gifs and emojis as possible!
204 changes: 204 additions & 0 deletions .github/images/jenkins-welcome.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion .github/workflows/updatecli.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: actions/checkout@v4

- name: Install Updatecli in the runner
uses: updatecli/updatecli-action@v2.77.0
uses: updatecli/updatecli-action@v2.78.1

- name: Run Updatecli in Dry Run mode
run: updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ build/
# external - see scripts/fetch-external-resources
/content/_tmp/
/content/_data/_generated/

/content/_data/indexpage/thank_you.yml

# external - files unzipped from /content/_tmp/
# generated pipeline step documentation
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTING.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ When they are ready, you will push your changes to your fork and submit a PR fro
== Building

This project uses GNU/Make and Docker to generate the fully statically link:https://jenkins.io[jenkins.io] web site.
If you need to install Docker, utilize the instructions for link:https://docs.docker.com/engine/install/[Docker Engine] or link:https://docs.docker.com/desktop/[Docker Desktop] depending on your environment.
The key tool to convert source code into the site is the link:https://github.com/awestruct/awestruct[Awestruct] static site generator, which is downloaded automatically as part of the build process.

Ensure you have GNU/Make and Curl and Docker available on your machine:
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ group :fetcher do
gem 'faraday-net_http', '~> 3.4'
gem 'json', '~> 2.9'
gem 'logger', '~> 1.6', '>= 1.6.3'
gem 'csv', '~> 3.3.2'
end

gem "concurrent-ruby", "~> 1.1"
Expand Down
2 changes: 2 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ GEM
coderay (1.1.3)
colorize (0.8.1)
concurrent-ruby (1.3.4)
csv (3.3.2)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
em-websocket (0.5.3)
Expand Down Expand Up @@ -144,6 +145,7 @@ DEPENDENCIES
base64
colorize
concurrent-ruby (~> 1.1)
csv (~> 3.3.2)
faraday (~> 2.12.0)
faraday-follow_redirects (~> 0.3.0)
faraday-net_http (~> 3.4)
Expand Down
8 changes: 8 additions & 0 deletions content/_data/awards/2024-0015.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
title: "DevOps Dozen 2024: Most Innovative DevOps Open Source Project"
image: awards/most-innovative-2024.png
url: https://devopsdozen.com/devops-dozen-2024-community-award-winners/
year: 2024
quote: The Jenkins open source project represents one of the greatest open source projects of all time, and another great project from the Linux Foundation.
It is an industry standard now boasting over 11 million Jenkins developers around the world.
Congrats to The Butler!
Alan Shimel, Techstrong Group Founder & CEO
40 changes: 40 additions & 0 deletions content/_data/changelogs/lts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12547,6 +12547,46 @@
message: |-
Ignore values with incorrect types when deserializing collections and maps in XML files.
- version: "2.492.2"
date: 2025-03-05
changes:
- type: bug
category: bug
pull: 10177
issue: 75163
authors:
- mawinter69
pr_title: "[JENKINS-75163] respect user timezone in historywidget"
message: |-
Use correct date in the History widget when a user has configured a dedicated time zone.
- type: bug
category: regression
pull: 10261
issue: 75265
authors:
- mawinter69
pr_title: "[JENKINS-75265] Fix notification for l:task"
message: |-
Fix notification for `l:task` (regression in 2.481).
- type: bug
category: regression
pull: 10259
issue: 75259
authors:
- mawinter69
pr_title: "[JENKINS-75259] Fix tooltip and console link in progressbar of non pipeline jobs in the executors widget"
message: |-
Fix tooltip and console link in progress bar of jobs in the executors widget (regression in 2.480).
- type: bug
category: regression
pull: 10271
issue: 75255
authors:
- jglick
pr_title: "[JENKINS-75255] Tolerate AccessDeniedException in AtomicFileWriter"
message: |-
Fix occasional failures to write files to the Jenkins home directory on Windows servers due to virus scanners (regression in 2.491).
# DO NOT EDIT THIS FILE DIRECTLY
# ALL CHANGES MUST GO THROUGH PULL REQUESTS
# MALFORMED FILE CONTENTS WILL BREAK THE SITE BUILD
80 changes: 78 additions & 2 deletions content/_data/changelogs/weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25965,8 +25965,8 @@
issue: 75259
authors:
- mawinter69
pr_title: "[JENKINS-75259] Fix tooltip and console link in `progressbar` of non
pipeline jobs in the executors widget"
pr_title: "[JENKINS-75259] Fix tooltip and console link in `progressbar` of
non pipeline jobs in the executors widget"
message: |-
Fix tooltip and console link in the progress bar of jobs in the executors widget.

Expand All @@ -25992,6 +25992,82 @@
# pull: 10292 (PR title: Update dependency io.jenkins.plugins:bootstrap5-api to v5.3.3-2)
# pull: 10295 (PR title: Update dependency io.jenkins.plugins:caffeine-api to v3.2.0-161.v691ef352cee1)

- version: '2.499'
date: 2025-02-25
changes:
- type: bug
category: bug
pull: 10309
issue: 75321
authors:
- Vlatombe
- MarkEWaite
pr_title: "[JENKINS-75321] Clarify the message displayed when loading the
content of the build history widget"
message: |-
Clarify the displayed message while the build history widget initializes.
- type: bug
category: bug
pull: 10312
issue: 75273
authors:
- janfaracik
pr_title: "[JENKINS-75273] Fix tabs border radius"
message: |-
Fix border radius overlap when multiple lines of view names are displayed.
- type: rfe
category: developer
pull: 10172
authors:
- slide
pr_title: Use UpdateSite implementation for connect and preValidate
message: |-
Developer: Allow UpdateSites to handle the connection for a URL for a download from that update site.

# pull: 10127 (PR title: Update dependency commons-beanutils:commons-beanutils to v1.10.1)
# pull: 10234 (PR title: [JENKINS-75152] Update hudson.model.Queue for long buildableItem queue cycle acceleration)
# pull: 10283 (PR title: Update dependency io.jenkins.plugins:checks-api to v2.2.3)
# pull: 10285 (PR title: Update babel monorepo to v7.26.9)
# pull: 10286 (PR title: Update dependency org.jenkins-ci.plugins:jackson2-api to v2.17.0-389.va_5c7e45cd806)
# pull: 10287 (PR title: Update dependency org.jenkins-ci.main:jenkins-test-harness to v2395)
# pull: 10288 (PR title: Update dependency io.jenkins.plugins:font-awesome-api to v6.7.2-1)
# pull: 10289 (PR title: Update dependency io.jenkins.plugins:jquery3-api to v3.7.1-3)
# pull: 10290 (PR title: Update dependency sass-loader to v16.0.5)
# pull: 10291 (PR title: Update dependency io.jenkins.plugins:plugin-util-api to v6)
# pull: 10293 (PR title: Update dependency io.jenkins.plugins:echarts-api to v5.5.1-6)
# pull: 10294 (PR title: Update dependency io.jenkins.plugins:prism-api to v1.29.0-19)
# pull: 10296 (PR title: Update dependency org.springframework.security:spring-security-bom to v6.4.3)
# pull: 10297 (PR title: Update dependency org.jenkins-ci.plugins:junit to v1316)
# pull: 10298 (PR title: Update stapler.version to v1952 (major))
# pull: 10299 (PR title: Update stapler.version to v1955 (major))
# pull: 10302 (PR title: remove tasklists from PR template)
# pull: 10304 (PR title: Update dependency org.jenkins-ci.main:jenkins-test-harness to v2403)
# pull: 10306 (PR title: Fill in since annotations)
# pull: 10307 (PR title: Flakes in `DisconnectNodeCommandTest.disconnectNodeManyShouldSucceedWithCause`)
# pull: 10310 (PR title: Update dependency org.awaitility:awaitility to v4.3.0)
# pull: 10311 (PR title: Update Gitpod Dockerfile to use Java JDK 21 by default)
# pull: 10313 (PR title: Update dependency postcss to v8.5.3)
# pull: 10314 (PR title: Update dependency io.jenkins.plugins:jakarta-activation-api to v2.1.3-2)
# pull: 10315 (PR title: Update dependency io.jenkins.plugins:jakarta-mail-api to v2.1.3-2)
# pull: 10316 (PR title: Update dependency io.jenkins.plugins:javax-activation-api to v1.2.0-8)
# pull: 10317 (PR title: Update dependency io.jenkins.plugins:javax-mail-api to v1.6.2-11)
# pull: 10318 (PR title: Update dependency org.jenkins-ci.plugins:ant to v513)
# pull: 10319 (PR title: Update dependency org.jenkins-ci.plugins:structs to v343)
# pull: 10321 (PR title: Update dependency globals to v16)
# pull: 10322 (PR title: Update dependency com.puppycrawl.tools:checkstyle to v10.21.3)
# pull: 10323 (PR title: Update dependency org.jenkins-ci.plugins:junit to v1317)
# pull: 10324 (PR title: Update peter-evans/create-pull-request digest to dd2324f)
# pull: 10325 (PR title: Update mina-sshd.version to v2.15.0)
# pull: 10327 (PR title: Update dependency io.jenkins.plugins:eddsa-api to v0.3.0-13.v7cb_69ed68f00)
# pull: 10328 (PR title: Update dependency io.jenkins.plugins:ionicons-api to v82)
# pull: 10329 (PR title: Update dependency org.jenkins-ci.plugins.workflow:workflow-step-api to v700)
# pull: 10330 (PR title: Update dependency org.jenkins-ci.plugins:antisamy-markup-formatter to v173)
# pull: 10331 (PR title: Revert "[JENKINS-75152] Update hudson.model.Queue for long buildableItem queue cycle acceleration")
# pull: 10332 (PR title: Update dependency org.jenkins-ci.plugins:trilead-api to v2.190.v1ed19f8137f8)
# pull: 10333 (PR title: Update dependency io.jenkins.plugins:bootstrap5-api to v5.3.3-3)
# pull: 10335 (PR title: Update eslint monorepo to v9.21.0)
# pull: 10338 (PR title: Fix checkstyle errors)

# DO NOT EDIT THIS FILE DIRECTLY ON GITHUB IF YOU HAVE COMMIT ACCESS
# ALL CHANGES MUST GO THROUGH PULL REQUESTS
# MALFORMED FILE CONTENTS WILL BREAK THE SITE BUILD
2 changes: 1 addition & 1 deletion content/_data/roadmap/roadmap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ categories:
- feature
- name: Document Jenkins on Kubernetes
description: Describe the concepts, techniques, and choices available for Jenkins on Kubernetes
status: near-term
status: released
link: /sigs/docs/#jenkins-on-kubernetes
labels:
- outreach-program
Expand Down
1 change: 1 addition & 0 deletions content/_data/upgrades/2-492-2.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
No notable changes requiring upgrade notes.
40 changes: 24 additions & 16 deletions content/awards.html.haml
Original file line number Diff line number Diff line change
@@ -1,21 +1,29 @@
---
layout: simplepage
title: Awards
tight: true
---

- site.awards.values.sort_by{ |award| [award['year'],award['name']] }.reverse.each do |award|
- if award['image']
%img{:src => expand_link('images/' + award['image']), :style => 'float: right; margin: 5px;'}
%h2
- if award['url']
%a{:href => award['url'], :target => '_blank'}
= award['title']
- else
= award['title']
- if award['description']
%p
= award['description']
- if award['quote']
%blockquote
= award['quote']
%div{:style => 'clear: both;'}
%p.app-description Highlighting the milestones and achievements of Jenkins.

- site.awards.values.sort_by { |award| [award['year'], award['name']] }.reverse.each do |award|
.award-item
.award-item__icon
- if award['image']
%img{src: expand_link('images/' + award['image']), alt: award['title'], width: "96"}
- else
%img{src: expand_link('/images/logos/jenkins/jenkins.svg'), alt: 'Placeholder', width: "96"}
.award-item__content
%h2.award-title
- if award['url']
%a{href: award['url'], target: '_blank', class: 'text-decoration-none'}
= award['title']
- else
= award['title']
- if award['description']
%p.award-description
= award['description']
- if award['quote']
%blockquote.award-quote
%p.mb-0
= award['quote']
65 changes: 65 additions & 0 deletions content/css/jenkins.css
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,17 @@ ion-icon {
padding-bottom: 0.5rem;
margin-bottom: 0.5rem;
}
.image-div img {
height: 36px;
width: 36px;
}
.contributor-data {
flex-direction: column;
align-items: center;
}
.image-div {
margin-bottom: 0.5rem;
}
}

@media (min-width: 992px) and (max-width: 1200px) {
Expand Down Expand Up @@ -948,6 +959,7 @@ blockquote {
margin-left: 15px;
padding: 10px 15px;
clear: right;
margin-top: -25px;
}

.toc li li {
Expand Down Expand Up @@ -1546,7 +1558,60 @@ ion-icon.report {
max-height: 128px;
}

.thank-you-block {
display: flex;
height: fit-content;
margin: 5rem;
justify-content: center;
align-items: center;
}

.thank-you-box {
background-color: rgb(218, 209, 198, 0.3);
padding: 1rem;
display: flex;
justify-content: center;
align-items: center;
border-radius: 20px;
}

.contributor-data {
padding: 24px;
display: flex;
gap: 1rem;
border-radius: 8px;
}

.image-div {
display: flex;
justify-content: center;
align-items: center;
}


.image-div img {
object-fit: contain;
height: 90px;
width: 90px;
max-width: 100%;
}

.desc-div p {
margin: 0;
font-size: 16px;
font-weight: 400;
}

.desc-div p a {
text-decoration: underline;
}

/* Algolia Searchbox Enhancements */
[data-theme="dark"] .DocSearch-NoResults p.DocSearch-Title {
color: rgba(255, 255, 255, 0.634);
font-weight: bold;
}

:root[data-theme="dark"] {
--docsearch-searchbox-background: rgb(30, 35, 40);
}
Loading

0 comments on commit 45e89c3

Please sign in to comment.