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 22, 2024
2 parents c404304 + 291e1e9 commit ca1863f
Show file tree
Hide file tree
Showing 109 changed files with 3,479 additions and 1,448 deletions.
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.52.0
uses: updatecli/updatecli-action@v2.55.0

- 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 Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ GEM
base64 (0.2.0)
coderay (1.1.3)
colorize (0.8.1)
concurrent-ruby (1.2.2)
concurrent-ruby (1.2.3)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
em-websocket (0.5.3)
Expand Down
5 changes: 4 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,10 @@ node('docker&&linux') {
}
}
stage('Purge cached CSS') {
sh 'curl -X PURGE https://www.jenkins.io/css/jenkins.css'
sh '''
curl -X PURGE https://www.jenkins.io/css/jenkins.css
curl -X PURGE https://www.jenkins.io/stylesheets/styles.css
'''
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion STYLEGUIDE.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ node {
// Declarative //
pipeline {
agent { docker { image 'node:20.11.0-alpine3.19' } }
agent { docker { image 'node:20.11.1-alpine3.19' } }
stages {
stage('Build') {
sh 'npm install'
Expand Down
56 changes: 54 additions & 2 deletions content/404.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,72 @@
layout: default
title: Not Found
notitle: true
hideSearchBar: true
---

:css
.errorcontainer {
text-align: center;
margin: 30px;
}

.errorcontainer img {
max-width: 12%;
height: auto;
}

.searchcontainer {
text-align: center;
display: flex;
justify-content: center;
align-items: center;
margin:10px;
}

.searchcontainer .DocSearch-Button{
width: 25%;
margin-bottom: 30px;
}

%div.errorcontainer
%img{:src => '/images/fire-jenkins.svg'}

%h1
%h3
The page you requested could not be found.

%p
%a{:href => "/"} Back to homepage

%div.searchcontainer
%h3
Search for related pages

:javascript
// fetch last segment from URL
const path = window.location.pathname;
const pathSegments = path.split('/').filter(Boolean);
const lastSegmentIndex = pathSegments.length - 1;
const lastSegment = pathSegments[lastSegmentIndex];

const div = document.createElement('div');
div.classList.add('searchcontainer');

const scriptFileEl = document.createElement('script');
scriptFileEl.setAttribute('defer', '');
scriptFileEl.setAttribute('src', `https://cdn.jsdelivr.net/npm/@docsearch/js@3`);
document.head.appendChild(scriptFileEl);

scriptFileEl.addEventListener('load', () => {
// enable docsearch
window.docsearch({
// point it at the renderroot
container: div,
indexName: 'jenkins',
appId: "M6L7Q4Z8HS",
apiKey: "52f8dfbff76ffd9106f1c68fee16154b",
searchParameters: {
},
initialQuery: lastSegment,
});
});

document.body.append(div);
5 changes: 5 additions & 0 deletions content/_data/authors/Yaniv-git.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
name: "Yaniv Nizry"
twitter: YNizry
github: Yaniv-git
---
8 changes: 8 additions & 0 deletions content/_data/awards/2023-0014.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
title: "DevOps Dozen 2023: Most Innovative DevOps Open Source Project"
image: awards/most-innovative-2023.png
url: https://devops.com/techstrong-group-announces-the-2023-devops-dozen%C2%B2-awards-honorees/
year: 2023
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
Loading

0 comments on commit ca1863f

Please sign in to comment.