Skip to content

Commit

Permalink
Merge branch 'jenkinsci:master' into jenkins-13493
Browse files Browse the repository at this point in the history
  • Loading branch information
Hrushi20 authored Aug 15, 2024
2 parents c0ff128 + 74cd5c9 commit b1bd121
Show file tree
Hide file tree
Showing 108 changed files with 1,615 additions and 1,776 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ updates:
# Maintain dependencies for maven
- package-ecosystem: "maven"
directory: "/"
ignore:
# Fails plugin bill of materials tests
# https://github.com/jenkinsci/bom/issues/3171
- dependency-name: "org.jenkins-ci.plugins:promoted-builds"
schedule:
interval: "weekly"
labels:
Expand Down
14 changes: 9 additions & 5 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
skip-changelog:
- any: [ '.github/**/*', '.gitignore', 'Jenkinsfile', '.mvn/**/*', '.sonarcloud.properties' ]
- changed-files:
- any-glob-to-any-file: [ '.gitattributes', '.github/**/*', '.gitignore', 'crowdin.yml', '.mvn/**/*' ]

dependencies:
- any: [ 'pom.xml' ]
- changed-files:
- any-glob-to-any-file: [ 'pom.xml' ]

documentation:
- any: [ '*.adoc' ]
- changed-files:
- any-glob-to-any-file: [ '*.adoc', '*.md', '*.txt', '**/*.html', '**/*.png', 'LICENSE*' ]

test:
- any: [ ' src/test/**/*' ]
tests:
- changed-files:
- any-glob-to-any-file: [ 'src/test/**/*' ]
33 changes: 0 additions & 33 deletions .github/pull_request_template.md

This file was deleted.

21 changes: 21 additions & 0 deletions .github/workflows/jenkins-security-scan.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Jenkins Security Scan

on:
push:
branches:
- master
pull_request:
types: [ opened, synchronize, reopened ]
workflow_dispatch:

permissions:
security-events: write
contents: read
actions: read

jobs:
security-scan:
uses: jenkins-infra/jenkins-security-scan/.github/workflows/jenkins-security-scan.yaml@v2
with:
java-cache: 'maven' # Optionally enable use of a build dependency cache. Specify 'maven' or 'gradle' as appropriate.
# java-version: 21 # Optionally specify what version of Java to set up for the build, or remove to use a recent default.
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v4
- uses: actions/labeler@v5
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
# Drafts your next Release notes as Pull Requests are merged into "master"
- uses: release-drafter/release-drafter@v5
- uses: release-drafter/release-drafter@v6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.7</version>
<version>1.8</version>
</extension>
</extensions>
Loading

0 comments on commit b1bd121

Please sign in to comment.