Skip to content

Commit 9b3f850

Browse files
authored
Merge branch 'master' into new-header
2 parents 4e8e6a1 + 171782a commit 9b3f850

Some content is hidden

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

53 files changed

+792
-1481
lines changed

.github/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
_extends: .github
1+
_extends: .github

.github/workflows/crowdin.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Crowdin Action
22

33
on:
44
schedule:
5-
- cron: '0 */12 * * *'
5+
- cron: "0 */12 * * *"
66
workflow_dispatch:
77

88
permissions:
@@ -15,7 +15,6 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
1918
- name: Checkout
2019
uses: actions/checkout@v4
2120

@@ -27,12 +26,12 @@ jobs:
2726
skip_untranslated_files: true
2827
push_translations: true
2928
export_only_approved: true
30-
commit_message: 'feat: New Crowdin translations'
29+
commit_message: "feat: New Crowdin translations"
3130
create_pull_request: true
32-
pull_request_title: 'New Crowdin translations'
33-
pull_request_labels: 'enhancement'
34-
base_url: 'https://jenkins.crowdin.com'
35-
config: 'crowdin.yml'
31+
pull_request_title: "New Crowdin translations"
32+
pull_request_labels: "enhancement"
33+
base_url: "https://jenkins.crowdin.com"
34+
config: "crowdin.yml"
3635
env:
3736
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3837
CROWDIN_PROJECT_ID: 4
Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
name: Jenkins Security Scan
2-
on:
3-
push:
4-
branches:
5-
- master
6-
pull_request:
7-
types: [ opened, synchronize, reopened ]
8-
workflow_dispatch:
9-
10-
permissions:
11-
security-events: write
12-
contents: read
13-
actions: read
14-
15-
jobs:
16-
security-scan:
17-
uses: jenkins-infra/jenkins-security-scan/.github/workflows/jenkins-security-scan.yaml@v2
18-
with:
19-
java-cache: 'maven' # Optionally enable use of a build dependency cache. Specify 'maven' or 'gradle' as appropriate.
20-
# java-version: 21 # Optionally specify what version of Java to set up for the build, or remove to use a recent default.
1+
name: Jenkins Security Scan
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
types: [opened, synchronize, reopened]
8+
workflow_dispatch:
9+
10+
permissions:
11+
security-events: write
12+
contents: read
13+
actions: read
14+
15+
jobs:
16+
security-scan:
17+
uses: jenkins-infra/jenkins-security-scan/.github/workflows/jenkins-security-scan.yaml@v2
18+
with:
19+
java-cache: "maven" # Optionally enable use of a build dependency cache. Specify 'maven' or 'gradle' as appropriate.
20+
# java-version: 21 # Optionally specify what version of Java to set up for the build, or remove to use a recent default.

.prettierignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Generated / build files
2+
target/
3+
work/
4+
node/
5+
6+
# Git
7+
.git
8+
9+
# Incorrectly flagging forwarding slashes in regex
10+
.github/renovate.json

.prettierrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"endOfLine": "auto"
3+
}

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
Design Library makes it easy for developers to build complex and consistent interfaces using Jenkins UI components
1212

1313
This plugin contains:
14+
1415
- demonstration of UI components available in Jenkins
1516
- snippets of Jelly ready-to-use examples
1617

@@ -20,7 +21,7 @@ You can open this project as a [Gitpod workspace](https://www.gitpod.io/) which
2021

2122
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/jenkinsci/design-library-plugin)
2223

23-
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),
24+
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),
2425
which will open the workspace in IntelliJ IDEA using JetBrains Gateway.
2526

2627
Alternatively clone this project and run `mvn hpi:run`.

crowdin.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
files:
2-
- source: '/src/main/resources/io/jenkins/plugins/designlibrary/**/*.properties'
2+
- source: "/src/main/resources/io/jenkins/plugins/designlibrary/**/*.properties"
33
ignore:
4-
- '/src/main/resources/io/jenkins/plugins/designlibrary/**/%file_name%_%two_letters_code%.properties'
5-
translation: '/src/main/resources/io/jenkins/plugins/designlibrary/**/%file_name%_%two_letters_code%.properties'
4+
- "/src/main/resources/io/jenkins/plugins/designlibrary/**/%file_name%_%two_letters_code%.properties"
5+
translation: "/src/main/resources/io/jenkins/plugins/designlibrary/**/%file_name%_%two_letters_code%.properties"
66
escape_quotes: 1
77
escape_special_characters: 0
8-
- source: '/src/main/resources/lib/samples/**/*.properties'
8+
- source: "/src/main/resources/lib/samples/**/*.properties"
99
ignore:
10-
- '/src/main/resources/lib/samples/**/%file_name%_%two_letters_code%.properties'
11-
translation: '/src/main/resources/lib/samples/**/%file_name%_%two_letters_code%.properties'
10+
- "/src/main/resources/lib/samples/**/%file_name%_%two_letters_code%.properties"
11+
translation: "/src/main/resources/lib/samples/**/%file_name%_%two_letters_code%.properties"
1212
escape_quotes: 1
1313
escape_special_characters: 0
1414

0 commit comments

Comments
 (0)