Skip to content

Commit 8febb3b

Browse files
committed
fix: pull request feedback
1 parent 49527a1 commit 8febb3b

File tree

9 files changed

+24
-10
lines changed

9 files changed

+24
-10
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Use Custom Gradle Distribution URL
2+
description: >
3+
Configures the gradle distribution URL to our custom URL
4+
5+
runs:
6+
using: composite
7+
steps:
8+
- name: Checkout tools
9+
run: |
10+
# Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties
11+
gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip
12+
shell: bash

.github/workflows/codebuild-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
8585
aws-region: us-west-2
8686
- name: Configure Gradle
87-
run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip
87+
uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url
8888
- name: Run Service Check Batch and Calculate Artifact Size Metrics
8989
id: svc-check-batch
9090
run: |
@@ -213,7 +213,7 @@ jobs:
213213
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
214214
aws-region: us-west-2
215215
- name: Configure Gradle
216-
run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip
216+
uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url
217217
- name: Calculate Artifact Size Metrics
218218
id: svc-check-batch
219219
run: |

.github/workflows/continuous-integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: ./aws-sdk-kotlin/.github/actions/setup-build
3636
- name: Configure Gradle
3737
working-directory: ./aws-sdk-kotlin
38-
run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip
38+
uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url
3939
- name: Test
4040
working-directory: ./aws-sdk-kotlin
4141
shell: bash
@@ -59,7 +59,7 @@ jobs:
5959
uses: ./aws-sdk-kotlin/.github/actions/setup-build
6060
- name: Configure Gradle
6161
working-directory: ./aws-sdk-kotlin
62-
run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip
62+
uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url
6363
- name: Build smithy-kotlin
6464
working-directory: ./smithy-kotlin
6565
shell: bash

.github/workflows/kat-transform.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
- name: Configure Gradle
4040
working-directory: ./aws-sdk-kotlin
41-
run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip
41+
uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url
4242

4343
- name: Setup kat
4444
uses: awslabs/aws-kotlin-repo-tools/.github/actions/setup-kat@main

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Checkout sources
2020
uses: actions/checkout@v4
2121
- name: Configure Gradle
22-
run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip
22+
uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url
2323
- name: Lint ${{ env.PACKAGE_NAME }}
2424
run: |
2525
./gradlew ktlint

.github/workflows/update-release-branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
java-version: 17
4545
cache: 'gradle'
4646
- name: Configure Gradle
47-
run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip
47+
uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url
4848
- name: Check merge base
4949
shell: bash
5050
run: |

examples/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
# Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
45
networkTimeout=10000
56
validateDistributionUrl=true
67
zipStoreBase=GRADLE_USER_HOME
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
# Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)