Skip to content

Commit dff4bd2

Browse files
Merge pull request #44 from usefulness/additional_arguments
2 parents 4160913 + 3721e57 commit dff4bd2

File tree

4 files changed

+55
-3
lines changed

4 files changed

+55
-3
lines changed

.github/workflows/main.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ on:
22
pull_request:
33

44
jobs:
5+
cancel-previous-workflows:
6+
name: Cancel previous workflow runs
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: styfle/cancel-workflow-action@0.10.0
10+
with:
11+
access_token: ${{ github.token }}
12+
513
test-job:
614
runs-on: ubuntu-latest
715
name: Run dependency diff action
@@ -32,3 +40,40 @@ jobs:
3240

3341
- run: echo '${{ steps.dependency-diff.outputs.text-diff }}'
3442
shell: bash
43+
44+
test-job-with-configuration-cache:
45+
runs-on: ubuntu-latest
46+
name: Test additional arguments
47+
steps:
48+
49+
- uses: actions/checkout@v3
50+
with:
51+
fetch-depth: 0
52+
53+
- name: set up JDK
54+
uses: actions/setup-java@v3
55+
with:
56+
distribution: 'temurin'
57+
java-version: 17
58+
59+
- run: |
60+
mkdir -p ~/.gradle
61+
printf "org.gradle.unsafe.configuration-cache=true" > ~/.gradle/gradle.properties
62+
shell: bash
63+
64+
- name: Cache
65+
uses: gradle/gradle-build-action@v2
66+
with:
67+
build-root-directory: testproject
68+
arguments: dependencies --no-configuration-cache
69+
70+
- id: dependency-diff
71+
uses: ./
72+
with:
73+
configuration: runtimeClasspath
74+
build-root-directory: testproject
75+
additional-gradle-arguments: "--no-configuration-cache"
76+
project: ""
77+
78+
- run: echo '${{ steps.dependency-diff.outputs.text-diff }}'
79+
shell: bash

Readme.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ All inputs with their default values:
7171
configuration: 'releaseRuntimeClasspath'
7272
project: 'app'
7373
build-root-directory: .
74+
additional-gradle-arguments: ''
7475
lib-version: '1.2.0'
7576
```
7677
@@ -81,6 +82,7 @@ Dependency diff for root projects can be configured using `project: ''`.
8182
For Android projects use the one that has `com.android.application` plugin applied.
8283
- **`build-root-directory`** - Relative path to folder containing gradle wrapper.
8384
Example usage: `build-root-directory: library`
85+
- **`additional-gradle-arguments`** - Additional arguments passed to internal Gradle invocation. Example: `"--no-configuration-cache"` or `"--stactrace"`
8486
- **`lib-version`** - Overrides [dependency-tree-diff](https://github.com/JakeWharton/dependency-tree-diff) dependency version
8587

8688
<details><summary></summary>

action.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ inputs:
1717
description: 'Dependency diff library version'
1818
required: true
1919
default: '1.2.0'
20+
additional-gradle-arguments:
21+
description: 'Additional arguments passed to gradle commands'
22+
required: false
23+
default: ''
2024
outputs:
2125
text-diff:
2226
description: "Dependency diff"
@@ -34,5 +38,6 @@ runs:
3438
INPUT_BASEREF: ${{ github.base_ref }}
3539
INPUT_BUILD_ROOT_DIR: ${{ inputs.build-root-directory }}
3640
INPUT_VERSION: ${{ inputs.lib-version }}
41+
ADDITIONAL_GRADLE_ARGUMENTS: ${{ inputs.additional-gradle-arguments }}
3742
run: ${{ github.action_path }}/entrypoint.sh
3843
shell: bash

entrypoint.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ cd "$INPUT_BUILD_ROOT_DIR"
44

55
wget "https://github.com/JakeWharton/dependency-tree-diff/releases/download/$INPUT_VERSION/dependency-tree-diff.jar" -q -O dependency-tree-diff.jar
66

7-
./gradlew projects
8-
./gradlew :"$INPUT_PROJECT":dependencies --configuration "$INPUT_CONFIGURATION" >new_diff.txt
7+
./gradlew $ADDITIONAL_GRADLE_ARGUMENTS projects
8+
./gradlew $ADDITIONAL_GRADLE_ARGUMENTS :"$INPUT_PROJECT":dependencies --configuration "$INPUT_CONFIGURATION" >new_diff.txt
99
git switch --force "$INPUT_BASEREF"
10-
./gradlew :"$INPUT_PROJECT":dependencies --configuration "$INPUT_CONFIGURATION" >old_diff.txt
10+
./gradlew $ADDITIONAL_GRADLE_ARGUMENTS :"$INPUT_PROJECT":dependencies --configuration "$INPUT_CONFIGURATION" >old_diff.txt
1111

1212
diff=$(java -jar dependency-tree-diff.jar old_diff.txt new_diff.txt)
1313
diff="${diff//'%'/'%25'}"

0 commit comments

Comments
 (0)