Skip to content

Commit 657a0c7

Browse files
SamirM-BESamirM-BE
committed
BUILD-9447 Cleaning unused variable and simplyfing tool paths
1 parent 1a5daf2 commit 657a0c7

File tree

11 files changed

+10
-50
lines changed

11 files changed

+10
-50
lines changed

‎README.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ See also [`config-maven`](#config-maven) input environment variables.
284284
| `cache-paths` | Custom cache paths (multiline). Overrides default `~/.m2/repository`. | (optional) |
285285
| `disable-caching` | Whether to disable Maven caching entirely | `false` |
286286
| `provenance` | Whether to generate provenance attestation for built artifacts | `false` |
287-
| `provenance-pull-request` | Whether to generate provenance attestation on pull requests (similar to deploy-pull-request) | `false` |
288287
| `provenance-artifact-paths` | Relative paths of artifacts for provenance attestation (glob pattern). See [Provenance Attestation](#provenance-attestation) | (optional) |
289288

290289
### Outputs
@@ -393,7 +392,6 @@ jobs:
393392
| `run-shadow-scans` | If true, run sonar scanner on all 3 platforms using the provided URL and token. If false, run on the platform provided by sonar-platform. When enabled, the sonar-platform setting is ignored | `false` |
394393
| `working-directory` | Relative path under github.workspace to execute the build in | `.` |
395394
| `provenance` | Whether to generate provenance attestation for built artifacts | `false` |
396-
| `provenance-pull-request` | Whether to generate provenance attestation on pull requests (similar to deploy-pull-request) | `false` |
397395
| `provenance-artifact-paths` | Relative paths of artifacts for provenance attestation (glob pattern). See [Provenance Attestation](#provenance-attestation) | (optional) |
398396

399397
### Outputs
@@ -623,7 +621,6 @@ jobs:
623621
| `cache-paths` | Custom cache paths (multiline). | `~/.gradle/caches`<br>`~/.gradle/wrapper` |
624622
| `disable-caching` | Whether to disable Gradle caching entirely | `false` |
625623
| `provenance` | Whether to generate provenance attestation for built artifacts | `false` |
626-
| `provenance-pull-request` | Whether to generate provenance attestation on pull requests (similar to deploy-pull-request) | `false` |
627624
| `provenance-artifact-paths` | Relative paths of artifacts for provenance attestation (glob pattern). See [Provenance Attestation](#provenance-attestation) | (optional) |
628625

629626
> [!TIP]
@@ -917,7 +914,6 @@ See also [`config-npm`](#config-npm) input environment variables.
917914
| `run-shadow-scans` | Enable analysis across all 3 SonarQube platforms (unified platform dogfooding) | `false` |
918915
| `build-name` | Name of the JFrog build to publish. | `<Repository name>` |
919916
| `provenance` | Whether to generate provenance attestation for built artifacts | `false` |
920-
| `provenance-pull-request` | Whether to generate provenance attestation on pull requests (similar to deploy-pull-request) | `false` |
921917
| `provenance-artifact-paths` | Relative paths of artifacts for provenance attestation (glob pattern). See [Provenance Attestation](#provenance-attestation) | (optional) |
922918

923919
### Outputs
@@ -1027,7 +1023,6 @@ jobs:
10271023
| `sonar-platform` | SonarQube primary platform - 'next', 'sqc-eu', 'sqc-us', or 'none'. Use 'none' to skip sonar scans | `next` |
10281024
| `run-shadow-scans` | Enable analysis across all 3 SonarQube platforms (unified platform dogfooding) | `false` |
10291025
| `provenance` | Whether to generate provenance attestation for built artifacts | `false` |
1030-
| `provenance-pull-request` | Whether to generate provenance attestation on pull requests (similar to deploy-pull-request) | `false` |
10311026
| `provenance-artifact-paths` | Relative paths of artifacts for provenance attestation (glob pattern). See [Provenance Attestation](#provenance-attestation) | (optional) |
10321027

10331028
### Outputs

‎build-gradle/action.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ inputs:
6161
provenance:
6262
description: Whether to generate provenance attestation for built artifacts
6363
default: 'false'
64-
provenance-pull-request:
65-
description: Whether to generate provenance attestation on pull requests (similar to deploy-pull-request)
66-
default: 'false'
6764
provenance-artifact-paths:
6865
description: >-
6966
Relative paths of the artifacts for which to generate a provenance attestation (glob pattern).

‎build-gradle/build.sh‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,12 +245,8 @@ export_built_artifacts() {
245245
echo "::group::Capturing built artifacts for attestation"
246246

247247
# Find all built artifacts, excluding sources/javadoc/tests JARs
248-
local artifacts find_bin
249-
find_bin="/bin/find"
250-
if [[ ! -x "$find_bin" ]]; then
251-
find_bin="/usr/bin/find"
252-
fi
253-
artifacts=$("$find_bin" . \( -path '*/build/libs/*' -o -path '*/build/distributions/*' -o -path '*/build/reports/*' \) \
248+
local artifacts
249+
artifacts=$(/usr/bin/find . \( -path '*/build/libs/*' -o -path '*/build/distributions/*' -o -path '*/build/reports/*' \) \
254250
\( -name '*.jar' -o -name '*.war' -o -name '*.ear' -o -name '*.zip' -o -name '*.tar.gz' -o -name '*.tar' -o -name '*.json' \) \
255251
! -name '*-sources.jar' ! -name '*-javadoc.jar' ! -name '*-tests.jar' \
256252
-type f 2>/dev/null)

‎build-maven/action.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ inputs:
6161
provenance:
6262
description: Whether to generate provenance attestation for built artifacts
6363
default: 'false'
64-
provenance-pull-request:
65-
description: Whether to generate provenance attestation on pull requests (similar to deploy-pull-request)
66-
default: 'false'
6764
provenance-artifact-paths:
6865
description: >-
6966
Relative paths of the artifacts for which to generate a provenance attestation (glob pattern).

‎build-maven/build.sh‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,8 @@ export_built_artifacts() {
208208
echo "Scanning for artifacts in: */${build_dir}/*"
209209

210210
# Find all built artifacts (excluding sources, javadoc, tests)
211-
local artifacts find_bin
212-
find_bin="/bin/find"
213-
if [[ ! -x "$find_bin" ]]; then
214-
find_bin="/usr/bin/find"
215-
fi
216-
artifacts=$("$find_bin" . -path "*/${build_dir}/*" \
211+
local artifacts
212+
artifacts=$(/usr/bin/find . -path "*/${build_dir}/*" \
217213
\( -name '*.jar' -o -name '*.war' -o -name '*.ear' -o -name '*.zip' -o -name '*.tar.gz' -o -name '*.tar' -o -name '*.pom' -o -name '*.asc' -o -name '*.json' \) \
218214
! -name '*-sources.jar' ! -name '*-javadoc.jar' ! -name '*-tests.jar' \
219215
-type f 2>/dev/null)

‎build-npm/action.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ inputs:
4545
provenance:
4646
description: Whether to generate provenance attestation for built artifacts
4747
default: 'false'
48-
provenance-pull-request:
49-
description: Whether to generate provenance attestation on pull requests (similar to deploy-pull-request)
50-
default: 'false'
5148
provenance-artifact-paths:
5249
description: >-
5350
Relative paths of the artifacts for which to generate a provenance attestation (glob pattern).

‎build-npm/build.sh‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -232,12 +232,8 @@ export_built_artifacts() {
232232

233233
echo "::group::Capturing built artifacts for attestation"
234234

235-
local artifacts find_bin
236-
find_bin="/bin/find"
237-
if [[ ! -x "$find_bin" ]]; then
238-
find_bin="/usr/bin/find"
239-
fi
240-
artifacts=$("$find_bin" .attestation-artifacts -name '*.tgz' -type f 2>/dev/null || true)
235+
local artifacts
236+
artifacts=$(/usr/bin/find .attestation-artifacts -name '*.tgz' -type f 2>/dev/null || true)
241237

242238
if [[ -z "$artifacts" ]]; then
243239
echo "::warning title=No artifacts found::No artifacts found for attestation in build output directories"

‎build-poetry/action.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ inputs:
4646
provenance:
4747
description: Whether to generate provenance attestation for built artifacts
4848
default: 'false'
49-
provenance-pull-request:
50-
description: Whether to generate provenance attestation on pull requests (similar to deploy-pull-request)
51-
default: 'false'
5249
provenance-artifact-paths:
5350
description: >-
5451
Relative paths of the artifacts for which to generate a provenance attestation (glob pattern).

‎build-poetry/build.sh‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -308,12 +308,8 @@ export_built_artifacts() {
308308

309309
echo "::group::Capturing built artifacts for attestation"
310310

311-
local artifacts find_bin
312-
find_bin="/bin/find"
313-
if [[ ! -x "$find_bin" ]]; then
314-
find_bin="/usr/bin/find"
315-
fi
316-
artifacts=$("$find_bin" dist -type f \( -name '*.tar.gz' -o -name '*.whl' -o -name '*.json' \) 2>/dev/null || true)
311+
local artifacts
312+
artifacts=$(/usr/bin/find dist -type f \( -name '*.tar.gz' -o -name '*.whl' -o -name '*.json' \) 2>/dev/null || true)
317313

318314
if [[ -z "$artifacts" ]]; then
319315
echo "::warning title=No artifacts found::No artifacts found for attestation in build output directories"

‎build-yarn/action.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ inputs:
4242
provenance:
4343
description: Whether to generate provenance attestation for built artifacts
4444
default: 'false'
45-
provenance-pull-request:
46-
description: Whether to generate provenance attestation on pull requests (similar to deploy-pull-request)
47-
default: 'false'
4845
provenance-artifact-paths:
4946
description: >-
5047
Relative paths of the artifacts for which to generate a provenance attestation (glob pattern).

0 commit comments

Comments
 (0)