root
/
jenkins
mirror of https://github.com/jenkinsci/jenkins.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge branch 'master' into refine-command-palette

This commit is contained in:
Tim Jacomb 2024-12-11 09:07:05 +00:00 committed by GitHub
parent cc63c9c8e5 d22cc2fa3c
commit dad5ef3266
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/publish-release-artifact.yml vendored
View File

@ -73,7 +73,7 @@ jobs:
wget -q https://get.jenkins.io/${REPO}/${PROJECT_VERSION}/${FILE_NAME} wget -q https://get.jenkins.io/${REPO}/${PROJECT_VERSION}/${FILE_NAME}
- name: Upload Release Asset - name: Upload Release Asset
id: upload-war id: upload-war
uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0 uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
@ -108,7 +108,7 @@ jobs:
- name: Upload Release Asset - name: Upload Release Asset
id: upload-deb id: upload-deb
if: always() if: always()
uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0 uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
@ -144,7 +144,7 @@ jobs:
- name: Upload Release Asset - name: Upload Release Asset
id: upload-rpm id: upload-rpm
if: always() if: always()
uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0 uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
@ -180,7 +180,7 @@ jobs:
- name: Upload Release Asset - name: Upload Release Asset
id: upload-msi id: upload-msi
if: always() if: always()
uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0 uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
@ -216,7 +216,7 @@ jobs:
- name: Upload Release Asset - name: Upload Release Asset
id: upload-suse-rpm id: upload-suse-rpm
if: always() if: always()
uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0 uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:

2
ath.sh
View File

@ -6,7 +6,7 @@ set -o xtrace
cd "$(dirname "$0")" cd "$(dirname "$0")"
# https://github.com/jenkinsci/acceptance-test-harness/releases # https://github.com/jenkinsci/acceptance-test-harness/releases
export ATH_VERSION=6081.v29b_ce3c2771c export ATH_VERSION=6103.v470620c9e43f
if [[ $# -eq 0 ]]; then if [[ $# -eq 0 ]]; then
export JDK=17 export JDK=17

4
test/pom.xml
View File

@ -218,13 +218,13 @@ THE SOFTWARE.
<dependency> <dependency>
<groupId>org.jenkins-ci.plugins</groupId> <groupId>org.jenkins-ci.plugins</groupId>
<artifactId>cloudbees-folder</artifactId> <artifactId>cloudbees-folder</artifactId>
<version>6.959.v4ed5cc9e2dd4</version> <version>6.969.v7d22c6eb_fde1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jenkins-ci.plugins</groupId> <groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId> <artifactId>credentials</artifactId>
<version>1389.vd7a_b_f5fa_50a_2</version> <version>1393.v6017143c1763</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

6
yarn.lock
View File

@ -4954,11 +4954,11 @@ __metadata:
linkType: hard linkType: hard
"nanoid@npm:^3.3.7": "nanoid@npm:^3.3.7":
version: 3.3.7 version: 3.3.8
resolution: "nanoid@npm:3.3.7" resolution: "nanoid@npm:3.3.8"
bin: bin:
nanoid: bin/nanoid.cjs nanoid: bin/nanoid.cjs
checksum: 10c0/e3fb661aa083454f40500473bb69eedb85dc160e763150b9a2c567c7e9ff560ce028a9f833123b618a6ea742e311138b591910e795614a629029e86e180660f3 checksum: 10c0/4b1bb29f6cfebf3be3bc4ad1f1296fb0a10a3043a79f34fbffe75d1621b4318319211cd420549459018ea3592f0d2f159247a6f874911d6d26eaaadda2478120
languageName: node languageName: node
linkType: hard linkType: hard