From a3ccdbbda078434e59e74320ad37711648b846f4 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Mon, 6 Jan 2025 15:03:16 -0500 Subject: [PATCH 01/32] misc: gradle mirror --- examples/gradle/wrapper/gradle-wrapper.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../ecs-credentials/gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties index 9355b415575..38cd5b845e2 100644 --- a/examples/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3499ded5c11..432c4e0ef57 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-8.5-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties b/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties index ffed3a254e9..05f8108d455 100644 --- a/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties +++ b/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 3f705677c155b42cbf5c256dde1dbd5bfaab96df Mon Sep 17 00:00:00 2001 From: 0marperez Date: Mon, 6 Jan 2025 15:20:41 -0500 Subject: [PATCH 02/32] fix: use different gradle versions --- examples/gradle/wrapper/gradle-wrapper.properties | 2 +- .../ecs-credentials/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties index 38cd5b845e2..28b1c9dfc52 100644 --- a/examples/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-8.5-bin.zip +distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties b/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties index 05f8108d455..221bb5c9b6c 100644 --- a/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties +++ b/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-8.5-bin.zip +distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 2c4b6c1a48cc8d5efb9d925641b909f9483176c6 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Tue, 7 Jan 2025 10:40:16 -0500 Subject: [PATCH 03/32] fix: only use mirror in ci --- .github/workflows/codebuild-ci.yml | 4 ++++ .github/workflows/continuous-integration.yml | 4 ++++ .github/workflows/kat-transform.yml | 3 +++ .github/workflows/lint.yml | 2 ++ .github/workflows/update-release-branch.yml | 2 ++ examples/gradle/wrapper/gradle-wrapper.properties | 2 +- .../ecs-credentials/gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index d6e7b4d9840..209dd64dad8 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -83,6 +83,8 @@ jobs: with: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 + - name: Configure Gradle + run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip - name: Run Service Check Batch and Calculate Artifact Size Metrics id: svc-check-batch run: | @@ -210,6 +212,8 @@ jobs: with: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 + - name: Configure Gradle + run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip - name: Calculate Artifact Size Metrics id: svc-check-batch run: | diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index b8cb2e12035..6d7843b6763 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -33,6 +33,8 @@ jobs: path: 'aws-sdk-kotlin' - name: Setup Build uses: ./aws-sdk-kotlin/.github/actions/setup-build + - name: Configure Gradle + run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip - name: Test working-directory: ./aws-sdk-kotlin shell: bash @@ -54,6 +56,8 @@ jobs: path: 'aws-sdk-kotlin' - name: Setup Build uses: ./aws-sdk-kotlin/.github/actions/setup-build + - name: Configure Gradle + run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip - name: Build smithy-kotlin working-directory: ./smithy-kotlin shell: bash diff --git a/.github/workflows/kat-transform.yml b/.github/workflows/kat-transform.yml index 6608dfae8b4..57f9f57ca94 100644 --- a/.github/workflows/kat-transform.yml +++ b/.github/workflows/kat-transform.yml @@ -36,6 +36,9 @@ jobs: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 + - name: Configure Gradle + run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip + - name: Setup kat uses: awslabs/aws-kotlin-repo-tools/.github/actions/setup-kat@main diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ae9d88579d7..9dd7f1d4e19 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,6 +18,8 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v4 + - name: Configure Gradle + run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip - name: Lint ${{ env.PACKAGE_NAME }} run: | ./gradlew ktlint diff --git a/.github/workflows/update-release-branch.yml b/.github/workflows/update-release-branch.yml index cad24ac60ff..5d929198021 100644 --- a/.github/workflows/update-release-branch.yml +++ b/.github/workflows/update-release-branch.yml @@ -43,6 +43,8 @@ jobs: distribution: 'corretto' java-version: 17 cache: 'gradle' + - name: Configure Gradle + run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip - name: Check merge base shell: bash run: | diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties index 28b1c9dfc52..38cd5b845e2 100644 --- a/examples/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-8.10-bin.zip +distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties b/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties index 221bb5c9b6c..05f8108d455 100644 --- a/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties +++ b/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-7.2-bin.zip +distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From f3b470088979bd3c446d776f966c838cf44e764c Mon Sep 17 00:00:00 2001 From: 0marperez Date: Tue, 7 Jan 2025 10:44:34 -0500 Subject: [PATCH 04/32] fix: use public gradle distro url when not in ci --- examples/gradle/wrapper/gradle-wrapper.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../ecs-credentials/gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties index 38cd5b845e2..1af9e0930b8 100644 --- a/examples/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 432c4e0ef57..3499ded5c11 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties b/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties index 05f8108d455..a5952066425 100644 --- a/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties +++ b/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 4a48e1def1be729f3d184e2f12c6698cf9f3e4a9 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Tue, 7 Jan 2025 10:52:44 -0500 Subject: [PATCH 05/32] fix: use proper working dir in CI --- .github/workflows/codebuild-ci.yml | 2 ++ .github/workflows/continuous-integration.yml | 2 ++ .github/workflows/kat-transform.yml | 1 + .github/workflows/lint.yml | 1 + .github/workflows/update-release-branch.yml | 1 + 5 files changed, 7 insertions(+) diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index 209dd64dad8..63a9034a6b9 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -84,6 +84,7 @@ jobs: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 - name: Configure Gradle + working-directory: ./aws-sdk-kotlin run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip - name: Run Service Check Batch and Calculate Artifact Size Metrics id: svc-check-batch @@ -213,6 +214,7 @@ jobs: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 - name: Configure Gradle + working-directory: ./aws-sdk-kotlin run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip - name: Calculate Artifact Size Metrics id: svc-check-batch diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 6d7843b6763..367e4503c62 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -34,6 +34,7 @@ jobs: - name: Setup Build uses: ./aws-sdk-kotlin/.github/actions/setup-build - name: Configure Gradle + working-directory: ./aws-sdk-kotlin run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip - name: Test working-directory: ./aws-sdk-kotlin @@ -57,6 +58,7 @@ jobs: - name: Setup Build uses: ./aws-sdk-kotlin/.github/actions/setup-build - name: Configure Gradle + working-directory: ./aws-sdk-kotlin run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip - name: Build smithy-kotlin working-directory: ./smithy-kotlin diff --git a/.github/workflows/kat-transform.yml b/.github/workflows/kat-transform.yml index 57f9f57ca94..d805abd97cb 100644 --- a/.github/workflows/kat-transform.yml +++ b/.github/workflows/kat-transform.yml @@ -37,6 +37,7 @@ jobs: aws-region: us-west-2 - name: Configure Gradle + working-directory: ./aws-sdk-kotlin run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip - name: Setup kat diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9dd7f1d4e19..100432f7f96 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,6 +19,7 @@ jobs: - name: Checkout sources uses: actions/checkout@v4 - name: Configure Gradle + working-directory: ./aws-sdk-kotlin run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip - name: Lint ${{ env.PACKAGE_NAME }} run: | diff --git a/.github/workflows/update-release-branch.yml b/.github/workflows/update-release-branch.yml index 5d929198021..80553b6c344 100644 --- a/.github/workflows/update-release-branch.yml +++ b/.github/workflows/update-release-branch.yml @@ -44,6 +44,7 @@ jobs: java-version: 17 cache: 'gradle' - name: Configure Gradle + working-directory: ./aws-sdk-kotlin run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip - name: Check merge base shell: bash From 083a9030c38ec848c1091e34d8b2f3a6738f1397 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Tue, 7 Jan 2025 10:55:35 -0500 Subject: [PATCH 06/32] fix: avoid configuring working-directory where not needed --- .github/workflows/codebuild-ci.yml | 1 - .github/workflows/lint.yml | 1 - .github/workflows/update-release-branch.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index 63a9034a6b9..53e5fc3ca60 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -214,7 +214,6 @@ jobs: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 - name: Configure Gradle - working-directory: ./aws-sdk-kotlin run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip - name: Calculate Artifact Size Metrics id: svc-check-batch diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 100432f7f96..9dd7f1d4e19 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,7 +19,6 @@ jobs: - name: Checkout sources uses: actions/checkout@v4 - name: Configure Gradle - working-directory: ./aws-sdk-kotlin run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip - name: Lint ${{ env.PACKAGE_NAME }} run: | diff --git a/.github/workflows/update-release-branch.yml b/.github/workflows/update-release-branch.yml index 80553b6c344..5d929198021 100644 --- a/.github/workflows/update-release-branch.yml +++ b/.github/workflows/update-release-branch.yml @@ -44,7 +44,6 @@ jobs: java-version: 17 cache: 'gradle' - name: Configure Gradle - working-directory: ./aws-sdk-kotlin run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip - name: Check merge base shell: bash From 49527a1fad77c4755d63407d16e6c076cc8ddf18 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Tue, 7 Jan 2025 10:57:59 -0500 Subject: [PATCH 07/32] fix: left over working dir config from codebuild ci --- .github/workflows/codebuild-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index 53e5fc3ca60..209dd64dad8 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -84,7 +84,6 @@ jobs: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 - name: Configure Gradle - working-directory: ./aws-sdk-kotlin run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip - name: Run Service Check Batch and Calculate Artifact Size Metrics id: svc-check-batch From 8febb3bcc83075ddd00637e0674b6c0665d5a56d Mon Sep 17 00:00:00 2001 From: 0marperez Date: Tue, 7 Jan 2025 17:32:44 -0500 Subject: [PATCH 08/32] fix: pull request feedback --- .../custom-gradle-distribution-url/action.yml | 12 ++++++++++++ .github/workflows/codebuild-ci.yml | 4 ++-- .github/workflows/continuous-integration.yml | 4 ++-- .github/workflows/kat-transform.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/update-release-branch.yml | 2 +- examples/gradle/wrapper/gradle-wrapper.properties | 3 ++- gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 3 ++- 9 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 .github/actions/custom-gradle-distribution-url/action.yml diff --git a/.github/actions/custom-gradle-distribution-url/action.yml b/.github/actions/custom-gradle-distribution-url/action.yml new file mode 100644 index 00000000000..6ca4097fa4a --- /dev/null +++ b/.github/actions/custom-gradle-distribution-url/action.yml @@ -0,0 +1,12 @@ +name: Use Custom Gradle Distribution URL +description: > + Configures the gradle distribution URL to our custom URL + +runs: + using: composite + steps: + - name: Checkout tools + run: | + # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties + gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip + shell: bash diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index 209dd64dad8..8de126ffafb 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -84,7 +84,7 @@ jobs: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 - name: Configure Gradle - run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip + uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Run Service Check Batch and Calculate Artifact Size Metrics id: svc-check-batch run: | @@ -213,7 +213,7 @@ jobs: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 - name: Configure Gradle - run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip + uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Calculate Artifact Size Metrics id: svc-check-batch run: | diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 367e4503c62..5c1e2cc474f 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -35,7 +35,7 @@ jobs: uses: ./aws-sdk-kotlin/.github/actions/setup-build - name: Configure Gradle working-directory: ./aws-sdk-kotlin - run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip + uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Test working-directory: ./aws-sdk-kotlin shell: bash @@ -59,7 +59,7 @@ jobs: uses: ./aws-sdk-kotlin/.github/actions/setup-build - name: Configure Gradle working-directory: ./aws-sdk-kotlin - run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip + uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Build smithy-kotlin working-directory: ./smithy-kotlin shell: bash diff --git a/.github/workflows/kat-transform.yml b/.github/workflows/kat-transform.yml index d805abd97cb..484a33275d7 100644 --- a/.github/workflows/kat-transform.yml +++ b/.github/workflows/kat-transform.yml @@ -38,7 +38,7 @@ jobs: - name: Configure Gradle working-directory: ./aws-sdk-kotlin - run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip + uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Setup kat uses: awslabs/aws-kotlin-repo-tools/.github/actions/setup-kat@main diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9dd7f1d4e19..91c18a6625f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout sources uses: actions/checkout@v4 - name: Configure Gradle - run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip + uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Lint ${{ env.PACKAGE_NAME }} run: | ./gradlew ktlint diff --git a/.github/workflows/update-release-branch.yml b/.github/workflows/update-release-branch.yml index 5d929198021..b68f9304377 100644 --- a/.github/workflows/update-release-branch.yml +++ b/.github/workflows/update-release-branch.yml @@ -44,7 +44,7 @@ jobs: java-version: 17 cache: 'gradle' - name: Configure Gradle - run: gradle wrapper --gradle-distribution-url ${{ secrets.CUSTOM_GRADLE_DISTRIBUTION_URL }}/gradle-8.5-bin.zip + uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Check merge base shell: bash run: | diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties index 1af9e0930b8..03a4afe7f27 100644 --- a/examples/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +# Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3499ded5c11..18362b78bde 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties b/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties index a5952066425..1f9bed5eeef 100644 --- a/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties +++ b/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +# Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 4117e058a7b0d3d108279eb322e89ee6703a12b8 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 10 Jan 2025 11:57:51 -0500 Subject: [PATCH 09/32] misc: possible fix --- .github/workflows/continuous-integration.yml | 2 -- .github/workflows/kat-transform.yml | 1 - 2 files changed, 3 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 5c1e2cc474f..93bf4e341fa 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -34,7 +34,6 @@ jobs: - name: Setup Build uses: ./aws-sdk-kotlin/.github/actions/setup-build - name: Configure Gradle - working-directory: ./aws-sdk-kotlin uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Test working-directory: ./aws-sdk-kotlin @@ -58,7 +57,6 @@ jobs: - name: Setup Build uses: ./aws-sdk-kotlin/.github/actions/setup-build - name: Configure Gradle - working-directory: ./aws-sdk-kotlin uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Build smithy-kotlin working-directory: ./smithy-kotlin diff --git a/.github/workflows/kat-transform.yml b/.github/workflows/kat-transform.yml index 484a33275d7..0370632d423 100644 --- a/.github/workflows/kat-transform.yml +++ b/.github/workflows/kat-transform.yml @@ -37,7 +37,6 @@ jobs: aws-region: us-west-2 - name: Configure Gradle - working-directory: ./aws-sdk-kotlin uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Setup kat From a7f56eec4a452439f24940579e6b444be7efd25d Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 10 Jan 2025 12:01:30 -0500 Subject: [PATCH 10/32] misc: pwd && ls becasue action can't be found --- .github/workflows/lint.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 91c18a6625f..05c983e1d2b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,6 +18,8 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v4 + - name: PWD & LS + run: pwd && ls - name: Configure Gradle uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Lint ${{ env.PACKAGE_NAME }} From 6e866823b9759a1d945887680b5aaccd9e62483f Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 10 Jan 2025 12:06:31 -0500 Subject: [PATCH 11/32] misc: add working dir to test --- .github/workflows/continuous-integration.yml | 1 + .github/workflows/lint.yml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 93bf4e341fa..1d57c0c9b57 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -34,6 +34,7 @@ jobs: - name: Setup Build uses: ./aws-sdk-kotlin/.github/actions/setup-build - name: Configure Gradle + working-directory: ./aws-sdk-kotlin uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Test working-directory: ./aws-sdk-kotlin diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 05c983e1d2b..1fba3793f92 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,9 +18,8 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v4 - - name: PWD & LS - run: pwd && ls - name: Configure Gradle + working-directory: ./aws-sdk-kotlin uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Lint ${{ env.PACKAGE_NAME }} run: | From 53bbeb08af671fb0f102077ee399885e08d1ffba Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 10 Jan 2025 12:26:10 -0500 Subject: [PATCH 12/32] pwd and ls again --- .github/actions/custom-gradle-distribution-url/action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/custom-gradle-distribution-url/action.yml b/.github/actions/custom-gradle-distribution-url/action.yml index 6ca4097fa4a..7685b49ea8e 100644 --- a/.github/actions/custom-gradle-distribution-url/action.yml +++ b/.github/actions/custom-gradle-distribution-url/action.yml @@ -7,6 +7,8 @@ runs: steps: - name: Checkout tools run: | + pwd + ls -a # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip shell: bash From 8aefd49ac53df3bffd64b29f69c4c836241dae06 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 10 Jan 2025 12:28:27 -0500 Subject: [PATCH 13/32] fix: use working directory --- .github/actions/custom-gradle-distribution-url/action.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/custom-gradle-distribution-url/action.yml b/.github/actions/custom-gradle-distribution-url/action.yml index 7685b49ea8e..1788229a6e7 100644 --- a/.github/actions/custom-gradle-distribution-url/action.yml +++ b/.github/actions/custom-gradle-distribution-url/action.yml @@ -6,9 +6,8 @@ runs: using: composite steps: - name: Checkout tools + working-directory: aws-sdk-kotlin run: | - pwd - ls -a # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip shell: bash From d63c6712b1260882820a03a1d899317190696aa1 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 10 Jan 2025 13:34:25 -0500 Subject: [PATCH 14/32] fix: possible fixes --- .github/workflows/codebuild-ci.yml | 2 -- .github/workflows/continuous-integration.yml | 1 - .github/workflows/lint.yml | 3 ++- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index 8de126ffafb..ab7b36caea0 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -83,8 +83,6 @@ jobs: with: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 - - name: Configure Gradle - uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Run Service Check Batch and Calculate Artifact Size Metrics id: svc-check-batch run: | diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 1d57c0c9b57..93bf4e341fa 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -34,7 +34,6 @@ jobs: - name: Setup Build uses: ./aws-sdk-kotlin/.github/actions/setup-build - name: Configure Gradle - working-directory: ./aws-sdk-kotlin uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Test working-directory: ./aws-sdk-kotlin diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 1fba3793f92..5da69519f42 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,8 +18,9 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v4 + with: + path: 'aws-sdk-kotlin' - name: Configure Gradle - working-directory: ./aws-sdk-kotlin uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Lint ${{ env.PACKAGE_NAME }} run: | From 57360502c003139c88da5df19673c19cba5af917 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 10 Jan 2025 14:40:49 -0500 Subject: [PATCH 15/32] possible fix for lint & adding custom URL to service check batch --- .github/actions/custom-gradle-distribution-url/action.yml | 4 ++-- .github/workflows/codebuild-ci.yml | 2 ++ .github/workflows/lint.yml | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/actions/custom-gradle-distribution-url/action.yml b/.github/actions/custom-gradle-distribution-url/action.yml index 1788229a6e7..4cee46fa5e1 100644 --- a/.github/actions/custom-gradle-distribution-url/action.yml +++ b/.github/actions/custom-gradle-distribution-url/action.yml @@ -1,11 +1,11 @@ -name: Use Custom Gradle Distribution URL +name: Configure gradle distribution URL description: > Configures the gradle distribution URL to our custom URL runs: using: composite steps: - - name: Checkout tools + - name: Configure gradle distribution URL working-directory: aws-sdk-kotlin run: | # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index 7c9cf2132b8..f10e305ec7b 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -85,6 +85,8 @@ jobs: with: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 + - name: Configure Gradle + uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Run Service Check Batch and Calculate Artifact Size Metrics id: svc-check-batch run: | diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7fa766d923b..547ec714173 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -21,10 +21,10 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v4 - with: - path: 'aws-sdk-kotlin' - name: Configure Gradle uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Lint ${{ env.PACKAGE_NAME }} run: | + pwd + ls ./gradlew ktlint From 55735e8b6048cce4aa33f1b6c751843bfe3f2c36 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 10 Jan 2025 14:46:02 -0500 Subject: [PATCH 16/32] misc: use path in lint workflow --- .github/workflows/lint.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 547ec714173..3f593ede0a6 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -21,6 +21,8 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v4 + with: + path: 'aws-sdk-kotlin' - name: Configure Gradle uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Lint ${{ env.PACKAGE_NAME }} From ad67c6bbbf94215364ab9b8cc71df4bd5887481a Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 10 Jan 2025 14:51:12 -0500 Subject: [PATCH 17/32] fix: use working dir in ktlint workflow --- .github/workflows/lint.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3f593ede0a6..80ae0cab4b4 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -26,7 +26,6 @@ jobs: - name: Configure Gradle uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Lint ${{ env.PACKAGE_NAME }} + working-directory: ./aws-sdk-kotlin run: | - pwd - ls ./gradlew ktlint From 1342474efc098362358696bbe4b41fe1e83328c0 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 10 Jan 2025 14:53:52 -0500 Subject: [PATCH 18/32] fix: use working dir in codebuild CI --- .github/workflows/codebuild-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index f10e305ec7b..3de4e1b9bf8 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -86,6 +86,7 @@ jobs: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 - name: Configure Gradle + working-directory: ./aws-sdk-kotlin uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Run Service Check Batch and Calculate Artifact Size Metrics id: svc-check-batch @@ -215,6 +216,7 @@ jobs: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 - name: Configure Gradle + working-directory: ./aws-sdk-kotlin uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Calculate Artifact Size Metrics id: svc-check-batch From 9ecf72cbb2967d52cbeaa924d931de49f80bf230 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 10 Jan 2025 15:02:01 -0500 Subject: [PATCH 19/32] Trigger CI From 6f9e46ba43cdd64098bc38dd064aa8bdcebb2841 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 10 Jan 2025 15:24:04 -0500 Subject: [PATCH 20/32] fix: use checkout sources v4 in codebuild CI --- .github/workflows/codebuild-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index 3de4e1b9bf8..5fc0ff9ef28 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -79,14 +79,13 @@ jobs: echo Please verify the PRs are not running any malicious code and mark the checkbox true when running the workflow exit 1 - name: Checkout sources - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 with: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 - name: Configure Gradle - working-directory: ./aws-sdk-kotlin uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Run Service Check Batch and Calculate Artifact Size Metrics id: svc-check-batch @@ -209,14 +208,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 with: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 - name: Configure Gradle - working-directory: ./aws-sdk-kotlin uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Calculate Artifact Size Metrics id: svc-check-batch From 6c00a70704ef4ba9f81b9868c892b341c54227d3 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 10 Jan 2025 15:30:11 -0500 Subject: [PATCH 21/32] fix: configure path when checking out in codebuild CI --- .github/workflows/codebuild-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index 5fc0ff9ef28..853d0099ed3 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -80,6 +80,8 @@ jobs: exit 1 - name: Checkout sources uses: actions/checkout@v4 + with: + path: 'aws-sdk-kotlin' - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 with: @@ -209,6 +211,8 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v4 + with: + path: 'aws-sdk-kotlin' - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 with: From 053fe7aae37e2cc46328ab6994dad3d8fc9c2a82 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 10 Jan 2025 15:38:27 -0500 Subject: [PATCH 22/32] fix: use working dir for every run --- .github/workflows/codebuild-ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index 853d0099ed3..0901a52a2cf 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -91,6 +91,7 @@ jobs: uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Run Service Check Batch and Calculate Artifact Size Metrics id: svc-check-batch + working-directory: ./aws-sdk-kotlin run: | REPOSITORY=$(echo ${{ github.repository }} | cut -d '/' -f 2) PULL_REQUEST="" @@ -119,12 +120,14 @@ jobs: if: ${{ cancelled() }} env: BUILD_ID: ${{ steps.svc-check-batch.outputs.aws-build-id }} + working-directory: ./aws-sdk-kotlin run: | if [ ! -z "$BUILD_ID" ]; then echo "cancelling in-progress batch build: id=$BUILD_ID" aws codebuild stop-build --id $BUILD_ID fi - name: Collect Artifact Size Metrics + working-directory: ./aws-sdk-kotlin run: | PULL_REQUEST="" INTERNAL=${{ github.event.number }} @@ -143,6 +146,7 @@ jobs: ./gradlew collectDelegatedArtifactSizeMetrics -PpullRequest=$PULL_REQUEST - name: Analyze Artifact Size Metrics + working-directory: ./aws-sdk-kotlin run: ./gradlew analyzeArtifactSizeMetrics - name: Show Results uses: actions/github-script@v7 @@ -197,6 +201,7 @@ jobs: - name: Evaluate Result if: ${{ !contains(github.event.pull_request.labels.*.name, 'acknowledge-artifact-size-increase') }} + working-directory: ./aws-sdk-kotlin run: | cd build/reports/metrics cat has-significant-change.txt | grep false || { @@ -222,6 +227,7 @@ jobs: uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Calculate Artifact Size Metrics id: svc-check-batch + working-directory: ./aws-sdk-kotlin run: | REPOSITORY=$(echo ${{ github.repository }} | cut -d '/' -f 2) @@ -234,14 +240,18 @@ jobs: if: ${{ cancelled() }} env: BUILD_ID: ${{ steps.svc-check-batch.outputs.aws-build-id }} + working-directory: ./aws-sdk-kotlin run: | if [ ! -z "$BUILD_ID" ]; then echo "cancelling in-progress batch build: id=$BUILD_ID" aws codebuild stop-build --id $BUILD_ID fi - name: Collect Artifact Size Metrics + working-directory: ./aws-sdk-kotlin run: ./gradlew collectDelegatedArtifactSizeMetrics -Prelease=${{ github.event.release.tag_name }} - name: Save Artifact Size Metrics + working-directory: ./aws-sdk-kotlin run: ./gradlew saveArtifactSizeMetrics -Prelease=${{ github.event.release.tag_name }} - name: Put Artifact Size Metrics in CloudWatch + working-directory: ./aws-sdk-kotlin run: ./gradlew putArtifactSizeMetricsInCloudWatch -Prelease=${{ github.event.release.tag_name }} From 271ed74f1b26fa02eedb17a0578079fd77f3c531 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Wed, 15 Jan 2025 12:51:05 -0500 Subject: [PATCH 23/32] Revert "fix: use working dir for every run" This reverts commit 053fe7aae37e2cc46328ab6994dad3d8fc9c2a82. --- .github/workflows/codebuild-ci.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index 0901a52a2cf..853d0099ed3 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -91,7 +91,6 @@ jobs: uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Run Service Check Batch and Calculate Artifact Size Metrics id: svc-check-batch - working-directory: ./aws-sdk-kotlin run: | REPOSITORY=$(echo ${{ github.repository }} | cut -d '/' -f 2) PULL_REQUEST="" @@ -120,14 +119,12 @@ jobs: if: ${{ cancelled() }} env: BUILD_ID: ${{ steps.svc-check-batch.outputs.aws-build-id }} - working-directory: ./aws-sdk-kotlin run: | if [ ! -z "$BUILD_ID" ]; then echo "cancelling in-progress batch build: id=$BUILD_ID" aws codebuild stop-build --id $BUILD_ID fi - name: Collect Artifact Size Metrics - working-directory: ./aws-sdk-kotlin run: | PULL_REQUEST="" INTERNAL=${{ github.event.number }} @@ -146,7 +143,6 @@ jobs: ./gradlew collectDelegatedArtifactSizeMetrics -PpullRequest=$PULL_REQUEST - name: Analyze Artifact Size Metrics - working-directory: ./aws-sdk-kotlin run: ./gradlew analyzeArtifactSizeMetrics - name: Show Results uses: actions/github-script@v7 @@ -201,7 +197,6 @@ jobs: - name: Evaluate Result if: ${{ !contains(github.event.pull_request.labels.*.name, 'acknowledge-artifact-size-increase') }} - working-directory: ./aws-sdk-kotlin run: | cd build/reports/metrics cat has-significant-change.txt | grep false || { @@ -227,7 +222,6 @@ jobs: uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Calculate Artifact Size Metrics id: svc-check-batch - working-directory: ./aws-sdk-kotlin run: | REPOSITORY=$(echo ${{ github.repository }} | cut -d '/' -f 2) @@ -240,18 +234,14 @@ jobs: if: ${{ cancelled() }} env: BUILD_ID: ${{ steps.svc-check-batch.outputs.aws-build-id }} - working-directory: ./aws-sdk-kotlin run: | if [ ! -z "$BUILD_ID" ]; then echo "cancelling in-progress batch build: id=$BUILD_ID" aws codebuild stop-build --id $BUILD_ID fi - name: Collect Artifact Size Metrics - working-directory: ./aws-sdk-kotlin run: ./gradlew collectDelegatedArtifactSizeMetrics -Prelease=${{ github.event.release.tag_name }} - name: Save Artifact Size Metrics - working-directory: ./aws-sdk-kotlin run: ./gradlew saveArtifactSizeMetrics -Prelease=${{ github.event.release.tag_name }} - name: Put Artifact Size Metrics in CloudWatch - working-directory: ./aws-sdk-kotlin run: ./gradlew putArtifactSizeMetricsInCloudWatch -Prelease=${{ github.event.release.tag_name }} From 2670696cabdf91046c8bb032ad47a678fd1bc0e2 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Wed, 15 Jan 2025 12:51:11 -0500 Subject: [PATCH 24/32] Revert "fix: configure path when checking out in codebuild CI" This reverts commit 6c00a70704ef4ba9f81b9868c892b341c54227d3. --- .github/workflows/codebuild-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index 853d0099ed3..5fc0ff9ef28 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -80,8 +80,6 @@ jobs: exit 1 - name: Checkout sources uses: actions/checkout@v4 - with: - path: 'aws-sdk-kotlin' - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 with: @@ -211,8 +209,6 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v4 - with: - path: 'aws-sdk-kotlin' - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 with: From 6f1e46e3d2b14bbdce684bda70178995c8341185 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Wed, 15 Jan 2025 12:51:14 -0500 Subject: [PATCH 25/32] Revert "fix: use checkout sources v4 in codebuild CI" This reverts commit 6f9e46ba43cdd64098bc38dd064aa8bdcebb2841. --- .github/workflows/codebuild-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index 5fc0ff9ef28..3de4e1b9bf8 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -79,13 +79,14 @@ jobs: echo Please verify the PRs are not running any malicious code and mark the checkbox true when running the workflow exit 1 - name: Checkout sources - uses: actions/checkout@v4 + uses: actions/checkout@v2 - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 with: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 - name: Configure Gradle + working-directory: ./aws-sdk-kotlin uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Run Service Check Batch and Calculate Artifact Size Metrics id: svc-check-batch @@ -208,13 +209,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v4 + uses: actions/checkout@v2 - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 with: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 - name: Configure Gradle + working-directory: ./aws-sdk-kotlin uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url - name: Calculate Artifact Size Metrics id: svc-check-batch From 2a281591fc7f385ce96dc250122870f282cf0d1a Mon Sep 17 00:00:00 2001 From: 0marperez Date: Wed, 15 Jan 2025 13:00:39 -0500 Subject: [PATCH 26/32] misc: hardcode configure gradle task --- .../custom-gradle-distribution-url/action.yml | 13 ------------- .github/workflows/codebuild-ci.yml | 10 ++++++---- .github/workflows/continuous-integration.yml | 8 ++++++-- .github/workflows/kat-transform.yml | 4 +++- .github/workflows/lint.yml | 4 +++- .github/workflows/update-release-branch.yml | 4 +++- 6 files changed, 21 insertions(+), 22 deletions(-) delete mode 100644 .github/actions/custom-gradle-distribution-url/action.yml diff --git a/.github/actions/custom-gradle-distribution-url/action.yml b/.github/actions/custom-gradle-distribution-url/action.yml deleted file mode 100644 index 4cee46fa5e1..00000000000 --- a/.github/actions/custom-gradle-distribution-url/action.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Configure gradle distribution URL -description: > - Configures the gradle distribution URL to our custom URL - -runs: - using: composite - steps: - - name: Configure gradle distribution URL - working-directory: aws-sdk-kotlin - run: | - # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties - gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip - shell: bash diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index 3de4e1b9bf8..cd9bcc445ff 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -86,8 +86,9 @@ jobs: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 - name: Configure Gradle - working-directory: ./aws-sdk-kotlin - uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url + run: | + # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties + gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip - name: Run Service Check Batch and Calculate Artifact Size Metrics id: svc-check-batch run: | @@ -216,8 +217,9 @@ jobs: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 - name: Configure Gradle - working-directory: ./aws-sdk-kotlin - uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url + run: | + # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties + gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip - name: Calculate Artifact Size Metrics id: svc-check-batch run: | diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 93bf4e341fa..c25c7808ca5 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -34,7 +34,9 @@ jobs: - name: Setup Build uses: ./aws-sdk-kotlin/.github/actions/setup-build - name: Configure Gradle - uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url + run: | + # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties + gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip - name: Test working-directory: ./aws-sdk-kotlin shell: bash @@ -57,7 +59,9 @@ jobs: - name: Setup Build uses: ./aws-sdk-kotlin/.github/actions/setup-build - name: Configure Gradle - uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url + run: | + # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties + gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip - name: Build smithy-kotlin working-directory: ./smithy-kotlin shell: bash diff --git a/.github/workflows/kat-transform.yml b/.github/workflows/kat-transform.yml index 7c9973b0b1b..7a43a0e5f9b 100644 --- a/.github/workflows/kat-transform.yml +++ b/.github/workflows/kat-transform.yml @@ -39,7 +39,9 @@ jobs: aws-region: us-west-2 - name: Configure Gradle - uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url + run: | + # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties + gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip - name: Setup kat uses: awslabs/aws-kotlin-repo-tools/.github/actions/setup-kat@main diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 80ae0cab4b4..778a81c4be3 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -24,7 +24,9 @@ jobs: with: path: 'aws-sdk-kotlin' - name: Configure Gradle - uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url + run: | + # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties + gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip - name: Lint ${{ env.PACKAGE_NAME }} working-directory: ./aws-sdk-kotlin run: | diff --git a/.github/workflows/update-release-branch.yml b/.github/workflows/update-release-branch.yml index b68f9304377..11082b821a5 100644 --- a/.github/workflows/update-release-branch.yml +++ b/.github/workflows/update-release-branch.yml @@ -44,7 +44,9 @@ jobs: java-version: 17 cache: 'gradle' - name: Configure Gradle - uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url + run: | + # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties + gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip - name: Check merge base shell: bash run: | From c4e11d50d92c3163c117ac43acdbe798f94dc33f Mon Sep 17 00:00:00 2001 From: 0marperez Date: Wed, 15 Jan 2025 13:13:16 -0500 Subject: [PATCH 27/32] fix: add working directories --- .github/workflows/continuous-integration.yml | 8 +++++++- .github/workflows/kat-transform.yml | 1 + .github/workflows/lint.yml | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index c25c7808ca5..877ecd6e825 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -58,7 +58,8 @@ jobs: path: 'aws-sdk-kotlin' - name: Setup Build uses: ./aws-sdk-kotlin/.github/actions/setup-build - - name: Configure Gradle + - name: Configure smithy-kotlin Gradle + working-directory: ./smithy-kotlin run: | # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip @@ -70,6 +71,11 @@ jobs: pwd ./gradlew --parallel assemble ./gradlew publishToMavenLocal + - name: Configure aws-sdk-kotlin Gradle + working-directory: ./aws-sdk-kotlin + run: | + # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties + gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip - name: Test working-directory: ./aws-sdk-kotlin shell: bash diff --git a/.github/workflows/kat-transform.yml b/.github/workflows/kat-transform.yml index 7a43a0e5f9b..850294f27d8 100644 --- a/.github/workflows/kat-transform.yml +++ b/.github/workflows/kat-transform.yml @@ -39,6 +39,7 @@ jobs: aws-region: us-west-2 - name: Configure Gradle + working-directory: ./aws-sdk-kotlin run: | # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 778a81c4be3..5c0e7b3aa9a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -24,6 +24,7 @@ jobs: with: path: 'aws-sdk-kotlin' - name: Configure Gradle + working-directory: ./aws-sdk-kotlin run: | # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip From b52f29363a1e810a7e7abac13b700ee618205781 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Wed, 15 Jan 2025 16:57:27 -0500 Subject: [PATCH 28/32] fix: add missing working directory --- .github/workflows/continuous-integration.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 877ecd6e825..8da8e7f6de6 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -34,6 +34,7 @@ jobs: - name: Setup Build uses: ./aws-sdk-kotlin/.github/actions/setup-build - name: Configure Gradle + working-directory: ./aws-sdk-kotlin run: | # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip From 4ced0534062d869a39010a1b78e7a926f79ce4c3 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Wed, 15 Jan 2025 18:26:04 -0500 Subject: [PATCH 29/32] misc: trigger CI From 0c0cd7d743d739ce94d28ef170cd664ddf53725c Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 17 Jan 2025 13:31:14 -0500 Subject: [PATCH 30/32] feat: use action --- .github/workflows/codebuild-ci.yml | 8 ++----- .github/workflows/continuous-integration.yml | 25 +++++++++----------- .github/workflows/kat-transform.yml | 7 +++--- .github/workflows/lint.yml | 8 +------ .github/workflows/update-release-branch.yml | 4 +--- 5 files changed, 18 insertions(+), 34 deletions(-) diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index cd9bcc445ff..609c81b0340 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -86,9 +86,7 @@ jobs: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 - name: Configure Gradle - run: | - # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties - gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip + uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main - name: Run Service Check Batch and Calculate Artifact Size Metrics id: svc-check-batch run: | @@ -217,9 +215,7 @@ jobs: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 - name: Configure Gradle - run: | - # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties - gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip + uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main - name: Calculate Artifact Size Metrics id: svc-check-batch run: | diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 7ac9599b16e..e0fe522e224 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -34,10 +34,9 @@ jobs: - name: Setup Build uses: ./aws-sdk-kotlin/.github/actions/setup-build - name: Configure Gradle - working-directory: ./aws-sdk-kotlin - run: | - # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties - gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip + uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main + with: + working-directory: ./aws-sdk-kotlin - name: Test working-directory: ./aws-sdk-kotlin shell: bash @@ -65,11 +64,10 @@ jobs: path: 'aws-sdk-kotlin' - name: Setup Build uses: ./aws-sdk-kotlin/.github/actions/setup-build - - name: Configure smithy-kotlin Gradle - working-directory: ./smithy-kotlin - run: | - # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties - gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip + - name: Configure Gradle - smithy-kotlin + uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main + with: + working-directory: ./smithy-kotlin - name: Build smithy-kotlin working-directory: ./smithy-kotlin shell: bash @@ -78,11 +76,10 @@ jobs: pwd ./gradlew --parallel assemble ./gradlew publishToMavenLocal - - name: Configure aws-sdk-kotlin Gradle - working-directory: ./aws-sdk-kotlin - run: | - # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties - gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip + - name: Configure Gradle aws-sdk-kotlin + uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main + with: + working-directory: ./aws-sdk-kotlin - name: Test working-directory: ./aws-sdk-kotlin shell: bash diff --git a/.github/workflows/kat-transform.yml b/.github/workflows/kat-transform.yml index 850294f27d8..ccdeddaf55b 100644 --- a/.github/workflows/kat-transform.yml +++ b/.github/workflows/kat-transform.yml @@ -39,10 +39,9 @@ jobs: aws-region: us-west-2 - name: Configure Gradle - working-directory: ./aws-sdk-kotlin - run: | - # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties - gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip + uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main + with: + working-directory: ./aws-sdk-kotlin - name: Setup kat uses: awslabs/aws-kotlin-repo-tools/.github/actions/setup-kat@main diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5c0e7b3aa9a..27addf43769 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -21,14 +21,8 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v4 - with: - path: 'aws-sdk-kotlin' - name: Configure Gradle - working-directory: ./aws-sdk-kotlin - run: | - # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties - gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip + uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main - name: Lint ${{ env.PACKAGE_NAME }} - working-directory: ./aws-sdk-kotlin run: | ./gradlew ktlint diff --git a/.github/workflows/update-release-branch.yml b/.github/workflows/update-release-branch.yml index 11082b821a5..a357e4d3d16 100644 --- a/.github/workflows/update-release-branch.yml +++ b/.github/workflows/update-release-branch.yml @@ -44,9 +44,7 @@ jobs: java-version: 17 cache: 'gradle' - name: Configure Gradle - run: | - # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties - gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip + uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main - name: Check merge base shell: bash run: | From f1c6672e3885ec8a30fc738093ec096d7cec7e55 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 17 Jan 2025 15:08:27 -0500 Subject: [PATCH 31/32] fix: remove wrapper changes --- gradle/wrapper/gradle-wrapper.properties | 2 +- .../ecs-credentials/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 18362b78bde..dace2bff9b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties b/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties index 1f9bed5eeef..156b7037866 100644 --- a/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties +++ b/tests/integration-tests/ecs-credentials/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https://services.gradle.org/distributions/gradle-8.12-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From b39f37711ca6f46b98374dfdf0e4c2277f6f123a Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 17 Jan 2025 15:18:25 -0500 Subject: [PATCH 32/32] fix: pr feedback --- examples/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties index 03a4afe7f27..c9deddd3bae 100644 --- a/examples/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists # Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME