Compare commits

..

7 Commits

Author SHA1 Message Date
Jerome Prinet
e48ea170d2 Add debug logs 2025-07-24 09:21:11 +02:00
Jerome Prinet
aac6626d42 Try to remove retries 2025-07-23 18:30:37 +02:00
Jerome Prinet
d45eec9a5e Run tests on candidate which requires JDK 17 in a specific job 2025-07-23 17:50:24 +02:00
Jerome Prinet
1b708738f6 Configure Java 17 when relevant 2025-07-23 17:39:55 +02:00
Jerome Prinet
3574b901d9 Configure Java 17 when relevant 2025-07-23 17:20:59 +02:00
Jérôme Prinet
19d90431a4 Merge branch 'main' into jprinet/bump-jdk-version 2025-07-21 14:45:23 +02:00
Jerome Prinet
b8ceb1b11e Bump JDK to 17 to match Gradle 9 requirements 2025-07-16 15:50:39 +02:00
56 changed files with 5361 additions and 6141 deletions

View File

@@ -4,7 +4,7 @@ inputs:
java-version:
description: 'Java version to use'
required: false
default: '17'
default: '11'
runs:
using: "composite"

View File

@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

View File

@@ -1,7 +1,7 @@
#!/bin/sh
#
# Copyright © 2015 the original authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.

View File

@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

View File

@@ -1,7 +1,7 @@
#!/bin/sh
#
# Copyright © 2015 the original authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.

View File

@@ -1,5 +1,5 @@
plugins {
id "com.gradle.develocity" version "4.1"
id "com.gradle.develocity" version "4.0.2"
id "com.gradle.common-custom-user-data-gradle-plugin" version "2.3"
}

View File

@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

View File

@@ -1,7 +1,7 @@
#!/bin/sh
#
# Copyright © 2015 the original authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.

View File

@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

View File

@@ -1,7 +1,7 @@
#!/bin/sh
#
# Copyright © 2015 the original authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.

View File

@@ -1,5 +1,5 @@
plugins {
id("com.gradle.develocity") version "4.1"
id("com.gradle.develocity") version "4.0.2"
id("com.gradle.common-custom-user-data-gradle-plugin") version "2.3"
}

View File

@@ -1,5 +1,5 @@
plugins {
id "com.gradle.develocity" version "4.1"
id "com.gradle.develocity" version "4.0.2"
}
develocity {

View File

@@ -1,5 +1,5 @@
plugins {
id "com.gradle.develocity" version "4.1"
id "com.gradle.develocity" version "4.0.2"
}
develocity {

View File

@@ -1,5 +1,5 @@
plugins {
id "com.gradle.develocity" version "4.1"
id "com.gradle.develocity" version "4.0.2"
}
develocity {

View File

@@ -43,7 +43,7 @@ jobs:
npm run compile
working-directory: sources
env:
NODE_OPTIONS: '-r @gradle-tech/develocity-agent/preload'
NODE_OPTIONS: '-r @gradle/develocity-agent/preload'
DEVELOCITY_URL: 'https://ge.solutions-team.gradle.com'
DEVELOCITY_ACCESS_KEY: '${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}'
@@ -52,6 +52,6 @@ jobs:
npm test
working-directory: sources
env:
NODE_OPTIONS: '-r @gradle-tech/develocity-agent/preload'
NODE_OPTIONS: '-r @gradle/develocity-agent/preload'
DEVELOCITY_URL: 'https://ge.solutions-team.gradle.com'
DEVELOCITY_ACCESS_KEY: '${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}'

View File

@@ -35,7 +35,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
with:
languages: ${{ matrix.language }}
config: |
@@ -43,4 +43,4 @@ jobs:
- sources/src
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0

View File

@@ -27,7 +27,7 @@ jobs:
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
distribution: temurin
java-version: 17
java-version: 11
- name: Setup Gradle
# Use a released version to avoid breakages
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1

View File

@@ -52,6 +52,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard.
- name: 'Upload to code-scanning'
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
with:
sarif_file: results.sarif

View File

@@ -3,7 +3,7 @@ name: CI-update-dist
on:
workflow_dispatch:
push:
branches:
branches:
- 'main'
- 'prerelease/**'
- 'release/**'
@@ -45,7 +45,7 @@ jobs:
npm run compile
working-directory: sources
env:
NODE_OPTIONS: '-r @gradle-tech/develocity-agent/preload'
NODE_OPTIONS: '-r @gradle/develocity-agent/preload'
DEVELOCITY_URL: 'https://ge.solutions-team.gradle.com'
DEVELOCITY_ACCESS_KEY: '${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}'
@@ -61,7 +61,7 @@ jobs:
git_user_signingkey: true
git_commit_gpgsign: true
git_config_global: true
# Commit and push changes; has no effect if the files did not change
# Important: The push event will not trigger any other workflows, see
# https://github.com/stefanzweifel/git-auto-commit-action?tab=readme-ov-file#commits-made-by-this-action-do-not-trigger-new-workflow-runs

View File

@@ -25,27 +25,14 @@ jobs:
strategy:
fail-fast: false
matrix:
gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
os: ${{fromJSON(inputs.runner-os)}}
include:
- java-version: 17
- gradle: '8.14.3'
java-version: 11
- gradle: '7.6.2'
java-version: 11
- gradle: '6.9.4'
java-version: 11
- gradle: '5.6.4'
java-version: 11
runs-on: ${{ matrix.os }}
steps:
- name: Checkout sources
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Initialize integ-test
uses: ./.github/actions/init-integ-test
with:
java-version: ${{ matrix.java-version }}
- name: Setup Gradle
id: setup-gradle

View File

@@ -34,7 +34,6 @@ jobs:
- name: Initialize integ-test
uses: ./.github/actions/init-integ-test
- name: Setup Gradle
uses: ./setup-gradle
with:

View File

@@ -231,26 +231,11 @@ jobs:
fail-fast: false
matrix:
os: ${{fromJSON(inputs.runner-os)}}
gradle: ['9.0.0', '8.14.3', '8.0.2', '7.6.4', '7.1.1', '6.9.4', '6.0.1', '5.6.4', '5.2.1']
gradle: ['8.0.2', '7.6.4', '7.1.1', '6.9.4', '6.0.1', '5.6.4', '5.2.1']
include:
- java-version: 17
- gradle: '8.14.3'
java-version: 11
- gradle: '8.0.2'
java-version: 11
- gradle: '7.6.4'
java-version: 11
- gradle: '7.1.1'
java-version: 11
- gradle: '6.9.4'
java-version: 11
- gradle: '6.0.1'
java-version: 11
- gradle: '5.6.4'
java-version: 11
build-root-suffix: -gradle-5
- gradle: '5.2.1'
java-version: 11
build-root-suffix: -gradle-5
runs-on: ${{ matrix.os }}
steps:
@@ -258,8 +243,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Initialize integ-test
uses: ./.github/actions/init-integ-test
with:
java-version: ${{ matrix.java-version }}
- name: Generate and submit dependencies
uses: ./dependency-submission
with:

View File

@@ -46,7 +46,7 @@ jobs:
shell: bash
working-directory: .github/workflow-samples/groovy-dsl
run: |
grep -q 'Eclipse Temurin JDK 8' output.txt || (echo "::error::Did not detect preinstalled JDK 8" && exit 1)
grep -q 'Eclipse Temurin JDK 1.8' output.txt || (echo "::error::Did not detect preinstalled JDK 1.8" && exit 1)
grep -q 'Eclipse Temurin JDK 11' output.txt || (echo "::error::Did not detect preinstalled JDK 11" && exit 1)
grep -q 'Eclipse Temurin JDK 17' output.txt || (echo "::error::Did not detect preinstalled JDK 17" && exit 1)
grep -q 'Eclipse Temurin JDK 21' output.txt || (echo "::error::Did not detect preinstalled JDK 21" && exit 1)
@@ -64,16 +64,16 @@ jobs:
- name: Initialize integ-test
uses: ./.github/actions/init-integ-test
- name: Setup Java 16
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
distribution: 'temurin'
java-version: 16
- name: Setup Java 20
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
distribution: 'temurin'
java-version: 20
- name: Setup Java 16
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
distribution: 'temurin'
java-version: 16
- name: Setup Gradle
uses: ./setup-gradle
- name: List detected toolchains
@@ -92,7 +92,7 @@ jobs:
shell: bash
working-directory: .github/workflow-samples/groovy-dsl
run: |
grep -q 'Eclipse Temurin JDK 8' output.txt || (echo "::error::Did not detect preinstalled JDK 8" && exit 1)
grep -q 'Eclipse Temurin JDK 1.8' output.txt || (echo "::error::Did not detect preinstalled JDK 1.8" && exit 1)
grep -q 'Eclipse Temurin JDK 11' output.txt || (echo "::error::Did not detect preinstalled JDK 11" && exit 1)
grep -q 'Eclipse Temurin JDK 17' output.txt || (echo "::error::Did not detect preinstalled JDK 17" && exit 1)
grep -q 'Eclipse Temurin JDK 21' output.txt || (echo "::error::Did not detect preinstalled JDK 21" && exit 1)

View File

@@ -28,23 +28,14 @@ jobs:
strategy:
fail-fast: false
matrix:
gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
os: ${{fromJSON(inputs.runner-os)}}
plugin-version: ['3.16.2', '4.1']
plugin-version: ['3.16.2', '4.0.2']
include:
- java-version: 17
- gradle: '8.14.3'
java-version: 11
- gradle: '7.6.2'
java-version: 11
- gradle: '6.9.4'
java-version: 11
- gradle: '5.6.4'
java-version: 11
- plugin-version: '3.16.2'
accessKeyEnv: GRADLE_ENTERPRISE_ACCESS_KEY
- plugin-version: '4.1'
accessKeyEnv: DEVELOCITY_ACCESS_KEY
- plugin-version: '3.16.2'
accessKeyEnv: GRADLE_ENTERPRISE_ACCESS_KEY
- plugin-version: '4.0.2'
accessKeyEnv: DEVELOCITY_ACCESS_KEY
runs-on: ${{ matrix.os }}
env:
DEVELOCITY_INJECTION_ENABLED: true
@@ -58,8 +49,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Initialize integ-test
uses: ./.github/actions/init-integ-test
with:
java-version: ${{ matrix.java-version }}
- name: Setup Gradle
id: setup-gradle
uses: ./setup-gradle
@@ -90,27 +80,15 @@ jobs:
strategy:
fail-fast: false
matrix:
gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
os: ${{fromJSON(inputs.runner-os)}}
plugin-version: ['3.16.2', '4.1']
include:
- java-version: 17
- gradle: '8.14.3'
java-version: 11
- gradle: '7.6.2'
java-version: 11
- gradle: '6.9.4'
java-version: 11
- gradle: '5.6.4'
java-version: 11
plugin-version: ['3.16.2', '4.0.2']
runs-on: ${{ matrix.os }}
steps:
- name: Checkout sources
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Initialize integ-test
uses: ./.github/actions/init-integ-test
with:
java-version: ${{ matrix.java-version }}
- name: Setup Gradle
id: setup-gradle
uses: ./setup-gradle
@@ -146,27 +124,16 @@ jobs:
strategy:
fail-fast: false
matrix:
gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
os: ${{fromJSON(inputs.runner-os)}}
plugin-version: [ '3.16.2', '4.1' ]
include:
- java-version: 17
- gradle: '8.14.3'
java-version: 11
- gradle: '7.6.2'
java-version: 11
- gradle: '6.9.4'
java-version: 11
- gradle: '5.6.4'
java-version: 11
plugin-version: [ '3.16.2', '4.0.2' ]
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Initialize integ-test
uses: ./.github/actions/init-integ-test
with:
java-version: ${{ matrix.java-version }}
- name: Setup Gradle
id: setup-gradle
uses: ./setup-gradle
@@ -188,27 +155,15 @@ jobs:
strategy:
fail-fast: false
matrix:
gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
os: ${{fromJSON(inputs.runner-os)}}
plugin-version: [ '3.16.2', '4.1' ]
include:
- java-version: 17
- gradle: '8.14.3'
java-version: 11
- gradle: '7.6.2'
java-version: 11
- gradle: '6.9.4'
java-version: 11
- gradle: '5.6.4'
java-version: 11
plugin-version: [ '3.16.2', '4.0.2' ]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout sources
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Initialize integ-test
uses: ./.github/actions/init-integ-test
with:
java-version: ${{ matrix.java-version }}
- name: Setup Gradle
id: setup-gradle
uses: ./setup-gradle

View File

@@ -36,8 +36,6 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Initialize integ-test
uses: ./.github/actions/init-integ-test
with:
java-version: '11'
- name: Setup Gradle with v6.9
uses: ./setup-gradle
@@ -54,19 +52,6 @@ jobs:
- name: Test uses Gradle v7.1.1
working-directory: .github/workflow-samples/no-wrapper
run: gradle help "-DgradleVersionCheck=7.1.1"
# Configure JDK 17 for Gradle 9 and later
- name: Setup Java
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
distribution: temurin
java-version: 17
- name: Setup Gradle with release-candidate
uses: ./setup-gradle
with:
gradle-version: release-candidate
- name: Test use release-candidate
working-directory: .github/workflow-samples/no-wrapper
run: gradle help
- name: Setup Gradle with current
id: gradle-current
uses: ./setup-gradle
@@ -76,22 +61,43 @@ jobs:
working-directory: .github/workflow-samples/no-wrapper
run: gradle help
- name: Check current version output parameter
if: ${{ !startsWith(steps.gradle-current.outputs.gradle-version , '9.') }}
if: ${{ !startsWith(steps.gradle-current.outputs.gradle-version , '8.') }}
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
script: |
core.setFailed('Gradle version parameter not set correctly: value was "${{ steps.gradle-current.outputs.gradle-version }}"')
provision-gradle-with-jdk-17:
strategy:
max-parallel: 1
fail-fast: false
matrix:
os: ${{fromJSON(inputs.runner-os)}}
runs-on: ${{ matrix.os }}
steps:
- name: Checkout sources
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Initialize integ-test
uses: ./.github/actions/init-integ-test
with:
java-version: '17'
- name: Setup Gradle with release-candidate
uses: ./setup-gradle
with:
gradle-version: release-candidate
- name: Test use release-candidate
working-directory: .github/workflow-samples/no-wrapper
run: gradle help
provision-gradle-version:
strategy:
fail-fast: false
matrix:
gradle: ['9.0.0', '8.14.2', '8.12', '8.12-rc-1', '8.9', '8.1', '7.6.4', '6.9.4', '5.6.4', '4.10.3', '3.5.1']
gradle: ['8.14.2', '8.12', '8.12-rc-1', '8.9', '8.1', '7.6.4', '6.9.4', '5.6.4', '4.10.3', '3.5.1']
os: ${{fromJSON(inputs.runner-os)}}
include:
- java-version: 11
- gradle: '9.0.0'
java-version: 17
- gradle: '5.6.4'
build-root-suffix: -gradle-5
- gradle: '4.10.3'

2
build
View File

@@ -3,7 +3,7 @@
cd sources
if [[ -f ~/.gradle/develocity/keys.properties ]]; then
export NODE_OPTIONS='-r @gradle-tech/develocity-agent/preload'
export NODE_OPTIONS='-r @gradle/develocity-agent/preload'
export DEVELOCITY_URL=https://ge.solutions-team.gradle.com
export DEVELOCITY_ACCESS_KEY=$(paste -sd ';' ~/.gradle/develocity/keys.properties)
fi

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -847,7 +847,7 @@ Here's a minimal example:
run: ./gradlew build
```
This configuration will automatically apply `v4.1` of the [Develocity Gradle plugin](https://docs.gradle.com/develocity/gradle-plugin/), and publish build scans to https://develocity.your-server.com.
This configuration will automatically apply `v4.0.2` of the [Develocity Gradle plugin](https://docs.gradle.com/develocity/gradle-plugin/), and publish build scans to https://develocity.your-server.com.
This example assumes that the `develocity.your-server.com` server allows anonymous publishing of build scans.
In the likely scenario that your Develocity server requires authentication, you will also need to pass a valid [Develocity access key](https://docs.gradle.com/develocity/gradle-plugin/#via_environment_variable) taken from a secret:

View File

@@ -8,7 +8,7 @@ module.exports = {
},
reporters: [
'default',
'@gradle-tech/develocity-agent/jest-reporter',
'@gradle/develocity-agent/jest-reporter',
],
verbose: true
}

2383
sources/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -41,32 +41,33 @@
"@actions/http-client": "2.2.3",
"@actions/tool-cache": "2.0.2",
"@octokit/webhooks-types": "7.6.1",
"cheerio": "1.1.2",
"cheerio": "1.1.0",
"semver": "7.7.2",
"string-argv": "0.3.2",
"typed-rest-client": "2.1.0",
"unhomoglyph": "1.0.6",
"which": "5.0.0"
},
"devDependencies": {
"@gradle-tech/develocity-agent": "1.0.1",
"@jest/globals": "30.0.5",
"@types/jest": "30.0.0",
"@types/node": "24.2.0",
"@gradle/develocity-agent": "https://develocity-npm-pkgs.gradle.com/gradle-develocity-agent-0.10.0.tgz",
"@jest/globals": "29.7.0",
"@types/jest": "29.5.14",
"@types/node": "20.19.0",
"@types/semver": "7.7.0",
"@types/unzipper": "0.10.11",
"@types/which": "3.0.4",
"@typescript-eslint/eslint-plugin": "8.39.0",
"@typescript-eslint/eslint-plugin": "8.34.0",
"@vercel/ncc": "0.38.3",
"dedent": "1.6.0",
"eslint": "9.24.0",
"globals": "16.3.0",
"jest": "30.0.5",
"globals": "16.2.0",
"jest": "29.7.0",
"nock": "13.5.6",
"npm-run-all": "4.1.5",
"patch-package": "8.0.0",
"prettier": "3.6.2",
"ts-jest": "29.4.1",
"typescript": "5.9.2"
"prettier": "3.5.3",
"ts-jest": "29.3.4",
"typescript": "5.8.3"
},
"overrides": {
"@azure/logger": "1.1.4",

View File

@@ -34,7 +34,7 @@ export async function setup(config: BuildScanConfig): Promise<void> {
// except if they are defined in the configuration
if (config.getBuildScanPublishEnabled()) {
maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true')
maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.1')
maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.0.2')
maybeExportVariable('DEVELOCITY_INJECTION_CCUD_PLUGIN_VERSION', '2.1')
maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_URL', config.getBuildScanTermsOfUseUrl())
maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_AGREE', config.getBuildScanTermsOfUseAgree())

View File

@@ -1,6 +1,7 @@
import * as httpm from 'typed-rest-client/HttpClient'
import * as cheerio from 'cheerio'
import * as core from '@actions/core'
import * as httpm from '@actions/http-client'
//import * as httpm from '@actions/http-client'
import fileWrapperChecksums from './wrapper-checksums.json'
@@ -69,20 +70,23 @@ async function httpGetJsonArray(url: string): Promise<unknown[]> {
}
async function httpGetText(url: string): Promise<string> {
const maxAttempts = 4
let attempts = 0
while (attempts < maxAttempts) {
try {
const response = await httpc.get(url)
return await response.readBody()
} catch (error) {
attempts++
if (attempts === maxAttempts) {
return new Promise((_resolve, reject) => reject(error))
}
}
}
return new Promise((_resolve, reject) => reject(new Error('Illegal state')))
const response = await httpc.get(url)
return await response.readBody()
// const maxAttempts = 4
// let attempts = 0
// while (attempts < maxAttempts) {
// try {
// const response = await httpc.get(url)
// return await response.readBody()
// } catch (error) {
// attempts++
// if (attempts === maxAttempts) {
// return new Promise((_resolve, reject) => reject(error))
// }
// }
// }
// return new Promise((_resolve, reject) => reject(new Error('Illegal state')))
}
async function addDistributionSnapshotChecksumUrls(checksumUrls: [string, string][]): Promise<void> {

View File

@@ -1,3 +1,5 @@
import * as core from '@actions/core'
import * as find from './find'
import * as checksums from './checksums'
import * as hash from './hash'
@@ -21,6 +23,16 @@ export async function findInvalidWrapperJars(
previouslyValidatedChecksums.includes(sha) ||
knownValidChecksums.checksums.has(sha)
) {
if (allowedChecksums.includes(sha)) {
core.info("Found allowed Gradle Wrapper JAR file: " + sha)
}
if (previouslyValidatedChecksums.includes(sha)) {
core.info(`Found previously validated Gradle Wrapper JAR file: ${sha}`)
}
if(knownValidChecksums.checksums.has(sha)) {
core.info(`Found known valid Gradle Wrapper JAR file: ${sha}`)
}
result.valid.push(new WrapperJar(wrapperJar, sha))
} else {
notYetValidatedWrappers.push(new WrapperJar(wrapperJar, sha))
@@ -36,6 +48,7 @@ export async function findInvalidWrapperJars(
if (!fetchedValidChecksums.checksums.has(wrapperJar.checksum)) {
result.invalid.push(wrapperJar)
} else {
core.info(`Fall back - Found valid Gradle Wrapper JAR file: ${wrapperJar.checksum}`)
result.valid.push(wrapperJar)
}
}

View File

@@ -1,12 +1,4 @@
[
{
"version": "9.0.0",
"checksum": "76805e32c009c0cf0dd5d206bddc9fb22ea42e84db904b764f3047de095493f3"
},
{
"version": "9.0.0-rc-4",
"checksum": "76805e32c009c0cf0dd5d206bddc9fb22ea42e84db904b764f3047de095493f3"
},
{
"version": "9.0.0-rc-3",
"checksum": "76805e32c009c0cf0dd5d206bddc9fb22ea42e84db904b764f3047de095493f3"

View File

@@ -17,7 +17,9 @@ export async function validateWrappers(
const allowedChecksums = process.env['ALLOWED_GRADLE_WRAPPER_CHECKSUMS']?.split(',') || []
const previouslyValidatedChecksums = checksumCache.load()
core.info(`gradleUserHome = ${gradleUserHome}`)
core.info(`Previously validated checksums loaded from cache: ${previouslyValidatedChecksums.join(', ')}`)
const result = await findInvalidWrapperJars(
workspaceRoot,
config.allowSnapshotWrappers(),

View File

@@ -14,15 +14,13 @@ repositories {
dependencies {
testImplementation gradleTestKit()
testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
testImplementation('org.spockframework:spock-junit4:2.3-groovy-4.0')
testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
testImplementation('org.spockframework:spock-junit4:2.3-groovy-3.0')
testImplementation ('io.ratpack:ratpack-groovy-test:1.9.0') {
exclude group: 'org.codehaus.groovy', module: 'groovy-all'
}
testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.19.2'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.19.1'
}
test {

View File

@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

View File

@@ -1,7 +1,7 @@
#!/bin/sh
#
# Copyright © 2015 the original authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.

View File

@@ -1,5 +1,5 @@
plugins {
id "com.gradle.develocity" version "4.1"
id "com.gradle.develocity" version "4.0.2"
id "com.gradle.common-custom-user-data-gradle-plugin" version "2.3"
}

View File

@@ -16,7 +16,7 @@ import java.nio.file.Files
import java.util.zip.GZIPOutputStream
class BaseInitScriptTest extends Specification {
static final String DEVELOCITY_PLUGIN_VERSION = '4.1'
static final String DEVELOCITY_PLUGIN_VERSION = '4.0.2'
static final String CCUD_PLUGIN_VERSION = '2.1'
static final TestGradleVersion GRADLE_3_X = new TestGradleVersion(GradleVersion.version('3.5.1'), 7, 9)

View File

@@ -248,7 +248,7 @@ task expectFailure {
when:
settingsFile.text = """
plugins {
id 'com.gradle.develocity' version '4.1' apply(false)
id 'com.gradle.develocity' version '4.0.2' apply(false)
}
gradle.settingsEvaluated {
apply plugin: 'com.gradle.develocity'