Merge branch 'jenkins-infra:master' into master

.github/ISSUE_TEMPLATE/1-documentation.yml

@@ -15,3 +15,7 @@ body:
       label: Reference any relevant documentation, other materials or issues/pull requests that can be used for inspiration.
     validations:
       required: false
+  - type: textarea
+    attributes:
+      label: Are you interested in contributing a fix?
+      description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc)

.github/ISSUE_TEMPLATE/3-enhancement.yml

@@ -19,3 +19,7 @@ body:
         * Links 1
     validations:
       required: false
+  - type: textarea
+    attributes:
+      label: Are you interested in contributing to this improvement?
+      description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc)

.github/ISSUE_TEMPLATE/4-bug.yml

@@ -31,3 +31,7 @@ body:
       description: If you have suggestions on a fix for the bug, please describe it here.
     validations:
       required: false
+  - type: textarea
+    attributes:
+      label: Are you interested in contributing a fix?
+      description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc)

.github/renovate.json

@@ -23,12 +23,6 @@
       "depNameTemplate": "node",
       "datasourceTemplate": "npm"
     },
-    {
-      "fileMatch": ["scripts/blobxfer"],
-      "matchStrings": ["CONTAINER_NAME=mcr.microsoft.com/blobxfer:(?<currentValue>.*?)\n"],
-      "depNameTemplate": "mcr.microsoft.com/blobxfer",
-      "datasourceTemplate": "docker"
-    },
     {
       "fileMatch": ["scripts/ruby"],
       "matchStrings": ["CONTAINER_NAME=ruby:(?<currentValue>.*?)\n"],

.github/workflows/compress-images.yaml

@@ -0,0 +1,56 @@
+# Image Actions will run in the following scenarios:
+# - on Pull Requests containing images (not including forks)
+# - on pushing of images to `master` (for forks)
+# - on demand (https://github.blog/changelog/2020-07-06-github-actions-manual-triggers-with-workflow_dispatch/)
+# - at 11 PM every Sunday in anything gets missed with any of the above scenarios
+# For Pull Requests, the images are added to the PR.
+# For other scenarios, a new PR will be opened if any images are compressed.
+name: Compress images
+on:
+  pull_request:
+    paths:
+      - '**.jpg'
+      - '**.jpeg'
+      - '**.png'
+      - '**.webp'
+  push:
+    branches:
+      - master
+    paths:
+      - '**.jpg'
+      - '**.jpeg'
+      - '**.png'
+      - '**.webp'
+  workflow_dispatch:
+  schedule:
+    - cron: '00 23 * * 0'
+jobs:
+  build:
+    name: calibreapp/image-actions
+    runs-on: ubuntu-latest
+    # Only run on main repo on and PRs that match the main repo.
+    if: |
+      github.repository == 'jenkins-infra/jenkins.io' &&
+      (github.event_name != 'pull_request' ||
+       github.event.pull_request.head.repo.full_name == github.repository)
+    steps:
+      - name: Checkout Branch
+        uses: actions/checkout@v4
+      - name: Compress Images
+        id: calibre
+        uses: calibreapp/image-actions@main
+        with:
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          # For non-Pull Requests, run in compressOnly mode and we'll PR after.
+          compressOnly: ${{ github.event_name != 'pull_request' }}
+      - name: Create Pull Request
+        # If it's not a Pull Request then commit any changes as a new PR.
+        if: |
+          github.event_name != 'pull_request' &&
+          steps.calibre.outputs.markdown != ''
+        uses: peter-evans/create-pull-request@v7
+        with:
+          title: Auto Compress Images
+          branch-suffix: timestamp
+          commit-message: Compress Images
+          body: ${{ steps.calibre.outputs.markdown }}

.github/workflows/label-conflicting-prs.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Label conflicting PRs
-        uses: eps1lon/actions-label-merge-conflict@fd1f295ee7443d13745804bc49fe158e240f6c6e # v2.1.0
+        uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
         with:
           dirtyLabel: "unresolved-merge-conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/updatecli.yaml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@v2.55.0
+        uses: updatecli/updatecli-action@v2.77.0
 
       - name: Run Updatecli in Dry Run mode
         run: updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml

.node-version

@@ -1 +1 @@
-20.10.0
+20.18.1

.ruby-version

@@ -1 +1 @@
-3.2.2
+3.3.6

.typos.toml

@@ -13,6 +13,8 @@ extend-exclude = [
   "content/blog/2016/2016-03-02-toulousejam-hackergarten.adoc",
   "content/blog/2012/2012-05-28-jenkins-a-besoin-de-vous.adoc",
   "content/blog/2012/2012-02-13-jenkins-user-conference-2012-paris.adoc",
+  # Germnan
+  "content/doc/developer/internationalization/i18n-source-code.adoc",
   # Spanish
   "content/blog/2017/04/2017-04-27-colombia.adoc",
   # Danish?
@@ -32,7 +34,9 @@ extend-exclude = [
   # Synopsys Software Integrity Group
   "content/security/advisory/2021-08-31.adoc",
   # HasS
-  "content/blog/2010/2010-08-26-cloudbees-announce-hudson-as-a-service.adoc"
+  "content/blog/2010/2010-08-26-cloudbees-announce-hudson-as-a-service.adoc",
+  # SSH Key
+  "content/blog/2023/03/30/2023-03-30-android-and-jenkins.adoc"
 ]
 
 [default]
@@ -54,6 +58,11 @@ check-filename = false
 "Jan22ndMeeting" = "Jan22ndMeeting"
 "4UmY4dDAlo0" = "4UmY4dDAlo0"
 "loLSNdCv6K4" = "loLSNdCv6K4"
+"ArachnePnR" = "ArachnePnR"
+"LIy90gGvmIU" = "LIy90gGvmIU"
+"71Nd_6OqdQk" = "71Nd_6OqdQk"
+"PNGs" = "PNGs"
+"Lso" = "Lso"
 "ND" = "ND"
 "nd" = "nd"
 "HashiCorp" = "HashiCorp"
@@ -63,6 +72,7 @@ check-filename = false
 [default.extend-words]
 "ACI" = "ACI"
 "AKS" = "AKS"
+"hpe" = "hpe"
 "Varian" = "Varian"
 # ./content/blog/2010/2010-09-20-tweet-of-the-day.adoc:13:32
 "Leary" = "Leary"
@@ -75,3 +85,4 @@ check-filename = false
 "vertx" = "vertx" # Name of a Jenkins plugin
 "FPT" = "FPT" # Name of a University
 "Brite" = "Brite" # EventBrite
+"Packt" = "Packt"

CONTRIBUTING.adoc

@@ -148,11 +148,11 @@ There are too many other helpful macros and formatting options to list here, so
 === Adding a blog post
 
 To add a new blog post, create a new file ending in **.adoc** (for link:https://asciidoctor.org[Asciidoctor]) in the appropriate `content/blog/<year>/<month>` directory with the full date and a *lowercase* title for your post.
-For example, if you're writing a post that you want to title "Hello World" on January 1st, 1970, you would create the file: `content/blog/1970/01/1970-01-01-hello-world.adoc`.
+For example, if you're writing a post that you want to title "Hello World" on January 15th, 1970, you would create the file: `content/blog/1970/01/1970-01-15-hello-world.adoc`.
 
 In that file you need to enter some meta-data in the following format:
 
-.1970-01-01-hello-world.adoc
+.1970-01-15-hello-world.adoc
 [source,yaml]
 ----
 ---
@@ -189,7 +189,7 @@ egrep -h '^- [^ ]+$' content/blog/*/*/*.adoc | sort | uniq -c
 
 The `author` attribute will map your GitHub name to author information which will be displayed in the blogpost.
 If this is your first time adding a blog post, please create an author file as documented in the section below.
-Once your author file is defined, you can return to your blog post file (`1970-01-01-hello-world.adoc`), finish creating the "front matter" and then write your blog post!
+Once your author file is defined, you can return to your blog post file (`1970-01-15-hello-world.adoc`), finish creating the "front matter" and then write your blog post!
 
 Images for blog posts should be placed in subdirectories of the `content/images/post-images/` directory.
 If a blog post is describing "feature-x" then the images might be in `content/images/post-images/feature-x/`.

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.10.0 as node
+FROM node:20.18.1 as node
 ENV USE_LOCAL_NODE=true
 
 WORKDIR /usr/src/jenkinsio/build/_site/
@@ -11,7 +11,7 @@ COPY scripts ./scripts
 RUN npm install
 RUN make assets
 
-FROM ruby:3.2.2 as builder
+FROM ruby:3.3.6 as builder
 ENV USE_LOCAL_RUBY=true
 
 # throw errors if Gemfile has been modified since Gemfile.lock

Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'colorize'
+gem 'base64' # needed since ruby 3.4 https://github.com/igrigorik/em-websocket/pull/161
 gem 'awestruct', '~> 0.6.7'
 gem 'naturally', '~> 2.2.1'
 gem 'asciidoctor', '~> 2.0.18'
@@ -9,17 +10,22 @@ gem 'webrick', '~> 1.8.1'
 
 gem 'sassc'
 gem 'rouge'
+gem 'iconv'
 
 # Support for various template engines we use
 gem 'haml', '~> 5.2.0'
-gem 'liquid', '~> 5.4.0'
-gem 'kramdown', '~> 2.4.0'
+gem 'liquid', '~> 5.5.0'
+gem 'kramdown', '~> 2.5.0'
 
 # Gems necessary for running scripts/fetch-external-resources
 group :fetcher do
-  gem 'faraday', '~> 2.8.0'
+  gem 'faraday', '~> 2.12.0'
   gem 'faraday-follow_redirects', '~> 0.3.0'
   gem 'rubyzip', '~> 2.3.2'
+  # dependencies for faraday 2.12.1
+  gem 'faraday-net_http', '~> 3.4'
+  gem 'json', '~> 2.9'
+  gem 'logger', '~> 1.6', '>= 1.6.3'
 end
 
 gem "concurrent-ruby", "~> 1.1"

Gemfile.lock

@@ -4,7 +4,7 @@ GEM
     addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     ansi (1.5.0)
-    asciidoctor (2.0.20)
+    asciidoctor (2.0.23)
     asciidoctor-jenkins-extensions (0.9.0)
       asciidoctor (>= 1.5.5)
       coderay (~> 1.1.1)
@@ -27,20 +27,21 @@ GEM
     base64 (0.2.0)
     coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    faraday (2.8.1)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
+    faraday (2.12.2)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
-    faraday-net_http (3.0.2)
+    faraday-net_http (3.4.0)
+      net-http (>= 0.5.0)
     ffi (1.13.1)
     formatador (1.1.0)
     git (1.18.0)
@@ -68,13 +69,16 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     http_parser.rb (0.8.0)
-    kramdown (2.4.0)
-      rexml
-    liquid (5.4.0)
+    iconv (1.1.0)
+    json (2.9.1)
+    kramdown (2.5.1)
+      rexml (>= 3.3.9)
+    liquid (5.5.1)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     little-plugger (1.1.4)
+    logger (1.6.4)
     logging (2.3.1)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
@@ -86,6 +90,8 @@ GEM
     multi_json (1.15.0)
     naturally (2.2.1)
     nenv (0.3.0)
+    net-http (0.6.0)
+      uri
     netrc (0.11.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -98,7 +104,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.1)
-    rack (2.2.6.4)
+    rack (2.2.8.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -108,14 +114,13 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.6)
-    rouge (4.1.3)
-    rss (0.3.0)
+    rexml (3.3.9)
+    rouge (4.2.1)
+    rss (0.3.1)
       rexml
     ruby-ll (2.1.2)
       ansi
       ast
-    ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     sassc (2.4.0)
       ffi (~> 1.9)
@@ -126,7 +131,8 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    webrick (1.8.1)
+    uri (0.13.1)
+    webrick (1.8.2)
 
 PLATFORMS
   ruby
@@ -135,13 +141,18 @@ DEPENDENCIES
   asciidoctor (~> 2.0.18)
   asciidoctor-jenkins-extensions (~> 0.9.0)
   awestruct (~> 0.6.7)
+  base64
   colorize
   concurrent-ruby (~> 1.1)
-  faraday (~> 2.8.0)
+  faraday (~> 2.12.0)
   faraday-follow_redirects (~> 0.3.0)
+  faraday-net_http (~> 3.4)
   haml (~> 5.2.0)
-  kramdown (~> 2.4.0)
-  liquid (~> 5.4.0)
+  iconv
+  json (~> 2.9)
+  kramdown (~> 2.5.0)
+  liquid (~> 5.5.0)
+  logger (~> 1.6, >= 1.6.3)
   naturally (~> 2.2.1)
   rouge
   rss