Skip to content

Commit 0b558ff

Browse files
authored
Merge branch 'master' into master
2 parents 0334170 + d938a49 commit 0b558ff

File tree

110 files changed

+2283
-854
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+2283
-854
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,16 @@ For frontend changes, include screenshots of the relevant page(s) before and aft
2424
For refactoring and code cleanup changes, exercise the code before and after the change and verify the behavior remains the same.
2525
-->
2626

27+
### Screenshots (UI changes only)
28+
29+
<!--
30+
If your change involves a UI change, please include screenshots showing the before and after states.
31+
-->
32+
33+
#### Before
34+
35+
#### After
36+
2737
### Proposed changelog entries
2838

2939
- human-readable text

.github/renovate.json

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": ["config:recommended", ":semanticCommitsDisabled"],
3+
"extends": ["github>jenkinsci/renovate-config"],
44
"prHourlyLimit": 0,
55
"prConcurrentLimit": 0,
6-
"postUpdateOptions": ["yarnDedupeHighest"],
76
"packageRules": [
8-
{
9-
"matchDatasources": ["npm"],
10-
"addLabels": ["javascript"],
11-
"minimumReleaseAge": "3 days",
12-
"reviewers": ["team:sig-ux"]
13-
},
147
{
158
"description": "Should be upgraded in lockstep in order to keep their corresponding Jetty versions aligned",
169
"matchManagers": ["maven"],
@@ -82,13 +75,6 @@
8275
"datasourceTemplate": "docker",
8376
"versioningTemplate": "loose"
8477
},
85-
{
86-
"customType": "regex",
87-
"managerFilePatterns": ["/.gitpod/Dockerfile/"],
88-
"matchStrings": ["ARG MAVEN_VERSION=(?<currentValue>.*?)\n"],
89-
"depNameTemplate": "org.apache.maven:maven-core",
90-
"datasourceTemplate": "maven"
91-
},
9278
{
9379
"customType": "regex",
9480
"managerFilePatterns": ["/core/src/site/site.xml/"],
@@ -111,15 +97,5 @@
11197
"datasourceTemplate": "maven"
11298
}
11399
],
114-
"labels": ["dependencies", "skip-changelog"],
115-
"rebaseWhen": "conflicted",
116-
"ignorePaths": [
117-
"**/node_modules/**",
118-
"**/bower_components/**",
119-
"**/vendor/**",
120-
"**/examples/**",
121-
"**/__tests__/**",
122-
"**/tests/**",
123-
"**/__fixtures__/**"
124-
]
100+
"labels": ["dependencies", "skip-changelog"]
125101
}

.github/workflows/announce-lts-rc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
discourse-author-username: jenkins-release-bot
1818
discourse-category: 23
1919
- name: Post on mailing list
20-
uses: dawidd6/action-send-mail@6d98ae34d733f9a723a9e04e94f2f24ba05e1402 # v6
20+
uses: dawidd6/action-send-mail@6e71c855c9a091d80a519621b9fd3e8d252ca40c # v7
2121
with:
2222
server_address: smtp.gmail.com
2323
server_port: 465

.github/workflows/changelog.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
env:
3636
GITHUB_AUTH: github-actions:${{ secrets.GITHUB_TOKEN }}
3737
- name: Upload Changelog YAML
38-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
38+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
3939
with:
4040
name: changelog.yaml
4141
path: changelog.yaml
@@ -44,15 +44,15 @@ jobs:
4444
runs-on: ubuntu-latest
4545
if: github.repository_owner == 'jenkinsci'
4646
steps:
47-
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
47+
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
4848
id: generate-token
4949
with:
5050
app-id: ${{ secrets.JENKINS_CHANGELOG_UPDATER_APP_ID }}
5151
private-key: ${{ secrets.JENKINS_CHANGELOG_UPDATER_PRIVATE_KEY }}
5252
owner: jenkins-infra
5353
repositories: jenkins.io
5454
- name: Check out
55-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
55+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5656
with:
5757
fetch-depth: 0
5858
- name: Publish jenkins.io changelog draft

.github/workflows/publish-release-artifact.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
is-lts: ${{ steps.set-version.outputs.is-lts }}
1717
is-rc: ${{ steps.set-version.outputs.is-rc }}
1818
steps:
19-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
19+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2020
- name: Set up JDK 21
21-
uses: actions/setup-java@4e7e684fbb6e33f88ecb2cf1e6b3797739cf499b #v 5.0.0
21+
uses: actions/setup-java@5d7b2146334bacf88728daaa70414a99f5164e0f #v 5.0.0
2222
with:
2323
distribution: "temurin"
2424
java-version: 21
@@ -74,7 +74,7 @@ jobs:
7474
wget -q https://get.jenkins.io/${REPO}/${PROJECT_VERSION}/${FILE_NAME}
7575
- name: Upload Release Asset
7676
id: upload-war
77-
uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
77+
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
7878
env:
7979
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8080
with:
@@ -109,7 +109,7 @@ jobs:
109109
- name: Upload Release Asset
110110
id: upload-deb
111111
if: always()
112-
uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
112+
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
113113
env:
114114
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
115115
with:
@@ -146,7 +146,7 @@ jobs:
146146
- name: Upload Release Asset
147147
id: upload-rpm
148148
if: always()
149-
uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
149+
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
150150
env:
151151
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
152152
with:
@@ -182,7 +182,7 @@ jobs:
182182
- name: Upload Release Asset
183183
id: upload-msi
184184
if: always()
185-
uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
185+
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
186186
env:
187187
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
188188
with:

.github/workflows/run-since-updater.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
if: ${{ github.repository_owner == 'jenkinsci' }}
1616
steps:
17-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
17+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1818
with:
1919
fetch-depth: 0
2020
- name: Run update-since-todo.py
@@ -29,7 +29,7 @@ jobs:
2929
id: run_script
3030
shell: bash
3131
- name: Create Pull Request
32-
uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412 # v7.0.9
32+
uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0
3333
with:
3434
token: ${{ secrets.GITHUB_TOKEN }}
3535
commit-message: Fill in since annotations

.gitpod.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

.gitpod/Dockerfile

Lines changed: 0 additions & 10 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,6 @@ Open another terminal and start a [webpack](https://webpack.js.org/) dev server,
8383
yarn start
8484
```
8585

86-
### Gitpod
87-
88-
You can open this project as a [Gitpod workspace](https://www.gitpod.io/) which comes pre-configured with all the tools you will need.
89-
You can use IntelliJ IDEA (preferred) or VS Code (alternate) in the browser.
90-
91-
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/jenkinsci/jenkins)
92-
93-
If you prefer using IntelliJ IDEA, you can setup Gitpod integration with JetBrains Gateway using the instructions on [gitpod.io](https://www.gitpod.io/docs/ides-and-editors/intellij),
94-
which will open the workspace in IntelliJ IDEA using JetBrains Gateway.
95-
9686
### Linting
9787

9888
For linting we use a number of tools:

0 commit comments

Comments
 (0)