Skip to content

Commit 0ef0e81

Browse files
kn: merge from main, fix Windows compilation (#1409)
2 parents e425de3 + 7fc34e8 commit 0ef0e81

File tree

81 files changed

+1308
-277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1308
-277
lines changed

.brazil.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"software.amazon.smithy:smithy-waiters:1.*": "Maven-software-amazon-smithy_smithy-waiters-1.x",
2727
"software.amazon.smithy:smithy-rules-engine:1.*": "Maven-software-amazon-smithy_smithy-rules-engine-1.x",
2828
"software.amazon.smithy:smithy-smoke-test-traits:1.*": "Maven-software-amazon-smithy_smithy-smoke-test-traits-1.x",
29-
"org.jsoup:jsoup:1.19.*": "Maven-jsoup-1.19.x"
29+
"org.jsoup:jsoup:1.*": "Maven-jsoup-1.x"
3030
},
3131
"packageHandlingRules": {
3232
"versioning": {
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"id": "7e4f8c08-941c-4ea5-91b3-4c284746c453",
3+
"type": "documentation",
4+
"description": "Improve documentation for [`StandardRetryPolicy`](https://docs.aws.amazon.com/smithy-kotlin/api/latest/runtime-core/aws.smithy.kotlin.runtime.retries.policy/-standard-retry-policy/)"
5+
}

.github/workflows/artifact-size-metrics.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Artifact Size Metrics
22
on:
3-
pull_request_target:
3+
pull_request:
44
types: [ opened, synchronize, reopened, labeled, unlabeled ]
55
branches:
66
- main
@@ -32,47 +32,45 @@ jobs:
3232
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
3333
aws-region: us-west-2
3434
- name: Configure Gradle
35-
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
35+
uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
3636
- name: Generate Artifact Size Metrics
3737
run: ./gradlew artifactSizeMetrics
3838
- name: Save Artifact Size Metrics
3939
run: ./gradlew saveArtifactSizeMetrics -Prelease=${{ github.event.release.tag_name }}
4040
- name: Put Artifact Size Metrics in CloudWatch
4141
run: ./gradlew putArtifactSizeMetricsInCloudWatch -Prelease=${{ github.event.release.tag_name }}
4242
size-check:
43-
if: github.event_name == 'pull_request_target'
4443
runs-on: ubuntu-latest
4544
steps:
4645
- name: Checkout Sources
4746
uses: actions/checkout@v4
4847
with:
4948
path: smithy-kotlin
49+
5050
- name: Setup build
5151
uses: ./smithy-kotlin/.github/actions/setup-build
52-
- name: Configure JDK
53-
uses: actions/setup-java@v3
54-
with:
55-
distribution: 'corretto'
56-
java-version: 17
57-
cache: 'gradle'
52+
5853
- name: Configure AWS Credentials
5954
uses: aws-actions/configure-aws-credentials@v4
6055
with:
6156
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
6257
aws-region: us-west-2
58+
6359
- name: Configure Gradle
64-
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
60+
uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
6561
with:
6662
working-directory: smithy-kotlin
63+
6764
- name: Generate Artifact Size Metrics
6865
run: ./gradlew -Paws.kotlin.native=false artifactSizeMetrics
6966
working-directory: smithy-kotlin
67+
7068
- name: Analyze Artifact Size Metrics
7169
run: ./gradlew analyzeArtifactSizeMetrics
7270
working-directory: smithy-kotlin
7371

7472
- name: Show Results
75-
uses: awslabs/aws-kotlin-repo-tools/.github/actions/artifact-size-metrics/show-results@main
73+
uses: aws/aws-kotlin-repo-tools/.github/actions/artifact-size-metrics/show-results@main
7674

7775
- name: Evaluate
7876
if: ${{ !contains(github.event.pull_request.labels.*.name, 'acknowledge-artifact-size-increase') }}

.github/workflows/changelog-verification.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ jobs:
2222
aws-region: us-west-2
2323

2424
- name: Verify changelog
25-
uses: awslabs/aws-kotlin-repo-tools/.github/actions/changelog-verification@main
25+
uses: aws/aws-kotlin-repo-tools/.github/actions/changelog-verification@main

.github/workflows/continuous-integration.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
java-version: 17
4747
cache: 'gradle'
4848
- name: Configure Gradle
49-
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
49+
uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
5050
with:
5151
working-directory: 'smithy-kotlin'
5252

@@ -176,7 +176,7 @@ jobs:
176176
cache: 'gradle'
177177

178178
- name: Configure Gradle
179-
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
179+
uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
180180
with:
181181
working-directory: 'smithy-kotlin'
182182

@@ -215,7 +215,7 @@ jobs:
215215
cache: 'gradle'
216216

217217
- name: Configure Gradle
218-
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
218+
uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
219219
with:
220220
working-directory: 'smithy-kotlin'
221221

@@ -237,6 +237,15 @@ jobs:
237237
- name: Setup build
238238
uses: ./smithy-kotlin/.github/actions/setup-build
239239

240+
- name: Checkout tools
241+
uses: actions/checkout@v4
242+
with:
243+
path: 'aws-kotlin-repo-tools'
244+
repository: 'aws/aws-kotlin-repo-tools'
245+
ref: '0.2.3'
246+
sparse-checkout: |
247+
.github
248+
240249
- name: Checkout aws-sdk-kotlin
241250
uses: ./aws-kotlin-repo-tools/.github/actions/checkout-head
242251
with:
@@ -253,12 +262,7 @@ jobs:
253262
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
254263
with:
255264
working-directory: ./aws-sdk-kotlin
256-
- name: Configure JDK
257-
uses: actions/setup-java@v3
258-
with:
259-
distribution: 'corretto'
260-
java-version: 17
261-
cache: 'gradle'
265+
262266
- name: Build and Test aws-sdk-kotlin downstream
263267
working-directory: ./smithy-kotlin
264268
run: |
@@ -277,4 +281,4 @@ jobs:
277281
sed -i "s/smithy-kotlin-codegen-version = .*$/smithy-kotlin-codegen-version = \"$SMITHY_KOTLIN_CODEGEN_VERSION\"/" gradle/libs.versions.toml
278282
./gradlew --parallel -Paws.kotlin.native=false publishToMavenLocal
279283
./gradlew -Paws.kotlin.native=false test jvmTest
280-
./gradlew -Paws.kotlin.native=false testAllProtocols
284+
./gradlew -Paws.kotlin.native=false testAllProtocols

.github/workflows/jreleaser.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# TODO: Delete this workflow when we migrate off JReleaser
2+
3+
name: JReleaser check
4+
on:
5+
pull_request:
6+
7+
jobs:
8+
jreleaser-check:
9+
permissions: {}
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: JReleaser check
13+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/jreleaser@main

.github/workflows/kat-transform.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Kat Transform
22

33
on:
4-
pull_request_target:
4+
pull_request:
55
types: [ opened, synchronize, reopened, labeled, unlabeled ]
66
branches:
77
- main
@@ -39,12 +39,12 @@ jobs:
3939
aws-region: us-west-2
4040

4141
- name: Configure Gradle
42-
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
42+
uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
4343
with:
4444
working-directory: ./smithy-kotlin
4545

4646
- name: Setup kat
47-
uses: awslabs/aws-kotlin-repo-tools/.github/actions/setup-kat@main
47+
uses: aws/aws-kotlin-repo-tools/.github/actions/setup-kat@main
4848

4949
- name: Build
5050
working-directory: ./smithy-kotlin
@@ -71,4 +71,4 @@ jobs:
7171
exit 1
7272
fi
7373
74-
echo "Transformation succeeded!"
74+
echo "Transformation succeeded!"

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Checkout sources
2323
uses: actions/checkout@v2
2424
- name: Configure Gradle
25-
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
25+
uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
2626
- name: Lint ${{ env.PACKAGE_NAME }}
2727
run: |
2828
./gradlew ktlint

.github/workflows/merge-main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Merge main
12-
uses: awslabs/aws-kotlin-repo-tools/.github/actions/merge-main@main
12+
uses: aws/aws-kotlin-repo-tools/.github/actions/merge-main@main
1313
with:
1414
ci-user-pat: ${{ secrets.CI_USER_PAT }}
1515
exempt-branches: # Add any if required

.github/workflows/release-readiness.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: actions/checkout@v4
1717

1818
- name: Configure Gradle
19-
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
19+
uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
2020

2121
- name: Build smithy-kotlin
2222
run: ./gradlew test jvmTest

0 commit comments

Comments
 (0)