Skip to content

Commit

Permalink
Merge branch 'master' into automated-weekly-changelog/2.494
Browse files Browse the repository at this point in the history
  • Loading branch information
kmartens27 authored Jan 21, 2025
2 parents 3962135 + bd255cd commit 3a0d83c
Show file tree
Hide file tree
Showing 12 changed files with 1,112 additions and 6 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.75.0
uses: updatecli/updatecli-action@v2.76.0

- name: Run Updatecli in Dry Run mode
run: updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml
Expand Down
1 change: 1 addition & 0 deletions .typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,4 @@ check-filename = false
"vertx" = "vertx" # Name of a Jenkins plugin
"FPT" = "FPT" # Name of a University
"Brite" = "Brite" # EventBrite
"Packt" = "Packt"
7 changes: 7 additions & 0 deletions content/_data/logo/jenkins-with-plate-basis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
name: 'jenkins-with-plate-basis'
url: 'logos/jenkins-with-plate-basis/jenkins-with-plate-basis.png'
url_256: 'logos/jenkins-with-plate-basis/jenkins-with-plate-basis-256px.png'
vector: 'logos/jenkins-with-plate-basis/jenkins-with-plate-basis.svg'
credit: 'Vectorized by Jim Klimov from Hyderabad JAM logo, as basis for other logos'
credit_url: 'https://github.com/jimklimov'
1 change: 1 addition & 0 deletions content/_data/logo/nut.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name: 'Jenkins serving NUT'
url: 'logos/nut/jenkins-nut-small.png'
url_256: 'logos/nut/jenkins-nut-small-256px.png'
vector: 'logos/nut/jenkins-nut-vector.svg'
credit: 'Jim Klimov'
credit_url: 'https://www.jimklimov.com/'
source: 'ci.networkupstools.org'
Expand Down
2 changes: 1 addition & 1 deletion content/_partials/changelog-old.html
Original file line number Diff line number Diff line change
Expand Up @@ -13027,7 +13027,7 @@ <h3 id=v104>What's new in 1.104 (04-22-2007)</h3>
Hudson can be now configured not to use CVS compression ('-z')
(<a href="https://issues.jenkins.io/browse/JENKINS-497">issue 497</a>)
<li class="rfe">
Native m2 modules are now labaled as 'Module's, not 'Project's.
Native m2 modules are now labeled as 'Module's, not 'Project's.
(<a href="https://issues.jenkins.io/browse/JENKINS-502">issue 502</a>)
<li class="rfe">
Added <a href="https://en.wikipedia.org/wiki/Favicon">favicon</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ On GitHub's conversation tab for each PR, users will see summaries for those che

More fine-grained statistics can be found in the `Details` page.

image::/images/post-images/2020/08-github-checks-api-plugin-coding-phase-2/severity-statistics.png[Severity Statis]
image::/images/post-images/2020/08-github-checks-api-plugin-coding-phase-2/severity-statistics.png[Severity Status]

Another practical feature is the annotation for specific lines of code. Users can now review the code alone with the annotations.

Expand Down
4 changes: 2 additions & 2 deletions content/doc/book/installing/_docker-for-tutorials.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ RUN echo "deb [arch=$(dpkg --print-architecture) \
$(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list
RUN apt-get update && apt-get install -y docker-ce-cli
USER jenkins
RUN jenkins-plugin-cli --plugins "blueocean:1.27.16 docker-workflow:580.vc0c340686b_54 json-path-api"
RUN jenkins-plugin-cli --plugins "blueocean:1.27.16 docker-workflow:592.v1001d948426c json-path-api"
----
.. Build a new docker image from this Dockerfile and assign the image a meaningful name, e.g. "myjenkins-blueocean:{jenkins-stable}-1":
+
Expand Down Expand Up @@ -252,7 +252,7 @@ RUN echo "deb [arch=$(dpkg --print-architecture) \
$(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list
RUN apt-get update && apt-get install -y docker-ce-cli
USER jenkins
RUN jenkins-plugin-cli --plugins "blueocean:1.27.16 docker-workflow:580.vc0c340686b_54 json-path-api"
RUN jenkins-plugin-cli --plugins "blueocean:1.27.16 docker-workflow:592.v1001d948426c json-path-api"
----
.. Build a new docker image from this Dockerfile and assign the image a meaningful name, e.g. "myjenkins-blueocean:{jenkins-stable}-1":
+
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
623 changes: 623 additions & 0 deletions content/images/logos/nut/jenkins-nut-vector.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 scripts/check-typos
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -o errexit
set -o nounset
set -o pipefail

TYPOS_VERSION=v1.28.1
TYPOS_VERSION=v1.29.0

if [[ -v CI ]] ; then
if [[ $OSTYPE == darwin* ]] ; then
Expand Down

0 comments on commit 3a0d83c

Please sign in to comment.