Skip to content

Commit 2f21000

Browse files
authored
Use the setup-gradle action to improve build times through caching. (opensearch-project#6868)
Use the setup-gradle action (at 6.1.0) to add caching to our builds. Update all setup-java actions to 5.2.0. Use commit SHAs for actions rather than version numbers for additional security on version changes. Signed-off-by: David Venable <dlv@amazon.com>
1 parent 9736e10 commit 2f21000

21 files changed

Lines changed: 137 additions & 29 deletions

.github/workflows/compatibility-data-prepper-api.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,19 @@ jobs:
2727

2828
steps:
2929
- name: Set up JDK
30-
uses: actions/setup-java@v4
30+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
3131
with:
3232
java-version: 11
3333
distribution: temurin
3434

3535
- name: Checkout Data Prepper
3636
uses: actions/checkout@v6
3737

38+
- name: Set up Gradle
39+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
40+
with:
41+
add-job-summary: on-failure
42+
3843
- name: Validate API compatibility
3944
run: ./gradlew -p data-prepper-api validateCompatibility
4045

.github/workflows/data-prepper-aws-secrets-e2e-tests.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,15 @@ jobs:
4545
chmod 644 ~/.aws/credentials ~/.aws/config
4646
ls -la ~/.aws/
4747
- name: Set up JDK 11
48-
uses: actions/setup-java@v1
48+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
4949
with:
5050
java-version: 11
51+
distribution: temurin
5152
- name: Checkout Data Prepper
5253
uses: actions/checkout@v2
54+
- name: Set up Gradle
55+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
56+
with:
57+
add-job-summary: on-failure
5358
- name: Run basic grok with AWS secrets end-to-end tests with Gradle
5459
run: AWS_PROFILE=default ./gradlew -PendToEndJavaVersion=${{ matrix.java }} :e2e-test:log:${{ matrix.test }}

.github/workflows/data-prepper-kafka-backward-compatibility-e2e-tests.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,15 @@ jobs:
2020

2121
steps:
2222
- name: Set up JDK 11
23-
uses: actions/setup-java@v1
23+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2424
with:
2525
java-version: 11
26+
distribution: temurin
2627
- name: Checkout Data Prepper
2728
uses: actions/checkout@v2
29+
- name: Set up Gradle
30+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
31+
with:
32+
add-job-summary: on-failure
2833
- name: Run Kafka backward compatibility end-to-end tests with Gradle
2934
run: ./gradlew -PendToEndJavaVersion=${{ matrix.java }} :e2e-test:kafka-buffer-backward-compatibility:kafkaBufferBackwardCompatibilityTest

.github/workflows/data-prepper-trace-analytics-raw-span-compatibility-e2e-tests.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,15 @@ jobs:
2020

2121
steps:
2222
- name: Set up JDK 11
23-
uses: actions/setup-java@v1
23+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2424
with:
2525
java-version: 11
26+
distribution: temurin
2627
- name: Checkout Data Prepper
2728
uses: actions/checkout@v2
29+
- name: Set up Gradle
30+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
31+
with:
32+
add-job-summary: on-failure
2833
- name: Run raw-span latest release compatibility end-to-end tests with Gradle
2934
run: ./gradlew -PendToEndJavaVersion=${{ matrix.java }} :e2e-test:trace:rawSpanLatestReleaseCompatibilityEndToEndTest

.github/workflows/data-prepper-trace-analytics-raw-span-e2e-tests.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,15 @@ jobs:
2121

2222
steps:
2323
- name: Set up JDK 11
24-
uses: actions/setup-java@v1
24+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2525
with:
2626
java-version: 11
27+
distribution: temurin
2728
- name: Checkout Data Prepper
2829
uses: actions/checkout@v2
30+
- name: Set up Gradle
31+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
32+
with:
33+
add-job-summary: on-failure
2934
- name: Run raw-span end-to-end tests with Gradle
3035
run: ./gradlew -PopenTelemetryVersion=${{ matrix.otelVersion }} -PendToEndJavaVersion=${{ matrix.java }} :e2e-test:trace:rawSpanEndToEndTest

.github/workflows/data-prepper-trace-analytics-raw-span-peer-forwarder-e2e-tests.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,16 @@ jobs:
2020

2121
steps:
2222
- name: Set up JDK 11
23-
uses: actions/setup-java@v1
23+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2424
with:
2525
java-version: 11
26+
distribution: temurin
2627
- name: Checkout Data Prepper
2728
uses: actions/checkout@v2
29+
- name: Set up Gradle
30+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
31+
with:
32+
add-job-summary: on-failure
2833
- name: Run raw-span latest release compatibility end-to-end tests with Gradle
2934
run: ./gradlew -PendToEndJavaVersion=${{ matrix.java }} :e2e-test:trace:rawSpanPeerForwarderEndToEndTest
3035
- name: Upload test results

.github/workflows/data-prepper-trace-analytics-service-map-e2e-tests.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,15 @@ jobs:
2020

2121
steps:
2222
- name: Set up JDK 11
23-
uses: actions/setup-java@v1
23+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2424
with:
2525
java-version: 11
26+
distribution: temurin
2627
- name: Checkout Data Prepper
2728
uses: actions/checkout@v2
29+
- name: Set up Gradle
30+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
31+
with:
32+
add-job-summary: on-failure
2833
- name: Run service-map end-to-end tests with Gradle
2934
run: ./gradlew -PendToEndJavaVersion=${{ matrix.java }} :e2e-test:trace:serviceMapPeerForwarderEndToEndTest

.github/workflows/e2e-tests-log-analytics.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,15 @@ jobs:
2222

2323
steps:
2424
- name: Set up JDK
25-
uses: actions/setup-java@v2
25+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2626
with:
27-
distribution: 'temurin'
27+
distribution: temurin
2828
java-version: 11
2929
- name: Checkout Data Prepper
3030
uses: actions/checkout@v2
31+
- name: Set up Gradle
32+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
33+
with:
34+
add-job-summary: on-failure
3135
- name: Run log analytics end-to-end tests with Gradle
3236
run: ./gradlew -PendToEndJavaVersion=${{ matrix.java }} :e2e-test:log:${{ matrix.test }}

.github/workflows/e2e-tests-peer-forwarder.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,15 @@ jobs:
2222

2323
steps:
2424
- name: Set up JDK
25-
uses: actions/setup-java@v2
25+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2626
with:
27-
distribution: 'temurin'
27+
distribution: temurin
2828
java-version: 11
2929
- name: Checkout Data Prepper
3030
uses: actions/checkout@v2
31+
- name: Set up Gradle
32+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
33+
with:
34+
add-job-summary: on-failure
3135
- name: Run peer-forward end-to-end tests with Gradle
3236
run: ./gradlew -PendToEndJavaVersion=${{ matrix.java }} :e2e-test:peerforwarder:${{ matrix.test }}

.github/workflows/examples-trace-analytics.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,19 @@ jobs:
3535

3636
steps:
3737
- name: Set up JDK 17
38-
uses: actions/setup-java@v1
38+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
3939
with:
4040
java-version: 17
41+
distribution: temurin
4142

4243
- name: Checkout Data Prepper
4344
uses: actions/checkout@v2
4445

46+
- name: Set up Gradle
47+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
48+
with:
49+
add-job-summary: on-failure
50+
4551
- name: Build Analytics Service
4652
working-directory: ./examples/trace-analytics-sample-app/sample-app/analytics-service
4753
run: ./gradlew build

0 commit comments

Comments
 (0)