.

Author: 0marperez

.github/actions/custom-gradle-distribution-url/action.yml renamed to .github/actions/smithy-kotlin-custom-gradle-distribution-url/action.yml

@@ -6,7 +6,6 @@ runs:
   using: composite
   steps:
     - name: Configure gradle distribution URL
-      working-directory: ./smithy-kotlin
       run: |
         # Keep gradle version in sync with smithy-kotlin/gradle/wrapper/gradle-wrapper.properties
         gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-8.12-bin.zip

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

@@ -18,8 +18,6 @@ jobs:
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v4
-        with:
-          path: 'smithy-kotlin'
       - name: Configure JDK
         uses: actions/setup-java@v3
         with:
@@ -32,7 +30,7 @@ jobs:
           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
+        uses: .github/actions/smithy-kotlin-custom-gradle-distribution-url
       - name: Generate Artifact Size Metrics
         run: ./gradlew artifactSizeMetrics
       - name: Save Artifact Size Metrics
@@ -45,8 +43,6 @@ jobs:
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v4
-        with:
-          path: 'smithy-kotlin'
       - name: Configure JDK
         uses: actions/setup-java@v3
         with:
@@ -59,7 +55,7 @@ jobs:
           role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
           aws-region: us-west-2
       - name: Configure Gradle
-        uses: ./smithy-kotlin/.github/actions/custom-gradle-distribution-url
+        uses: .github/actions/smithy-kotlin-custom-gradle-distribution-url
       - name: Generate Artifact Size Metrics
         run: ./gradlew artifactSizeMetrics
       - name: Analyze Artifact Size Metrics

.github/workflows/continuous-integration.yml

@@ -31,16 +31,14 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
-        with:
-          path: 'smithy-kotlin'
       - name: Configure JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'corretto'
           java-version: 17
           cache: 'gradle'
       - name: Configure Gradle
-        uses: ./smithy-kotlin/.github/actions/custom-gradle-distribution-url
+        uses: .github/actions/smithy-kotlin-custom-gradle-distribution-url
       - name: Test
         shell: bash
         run: |
@@ -55,18 +53,17 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
-        with:
-          path: 'smithy-kotlin'
       - name: Configure JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'corretto'
           java-version: 17
           cache: 'gradle'
       - name: Configure Gradle
-        uses: ./smithy-kotlin/.github/actions/custom-gradle-distribution-url
+        uses: .github/actions/smithy-kotlin-custom-gradle-distribution-url
       - name: Test
         shell: bash
+        working-directory: ./smithy-kotlin
         run: |
           # FIXME K2. Re-enable warnings as errors after this warning is removed: https://youtrack.jetbrains.com/issue/KT-68532
           # echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties              
@@ -84,16 +81,14 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
-        with:
-          path: 'smithy-kotlin'
       - name: Configure JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'corretto'
           java-version: 17
           cache: 'gradle'
       - name: Configure Gradle
-        uses: ./smithy-kotlin/.github/actions/custom-gradle-distribution-url
+        uses: .github/actions/smithy-kotlin-custom-gradle-distribution-url
       - name: Test
         shell: bash
         run: |
@@ -105,8 +100,6 @@ jobs:
     steps:
     - name: Checkout sources
       uses: actions/checkout@v4
-      with:
-        path: 'smithy-kotlin'
     - name: Checkout tools
       uses: actions/checkout@v4
       with:
@@ -122,9 +115,10 @@ jobs:
         path: 'aws-sdk-kotlin'
         repository: 'awslabs/aws-sdk-kotlin'
     - name: Configure Gradle for smithy-kotlin
-      uses: ./smithy-kotlin/.github/actions/custom-gradle-distribution-url
+      uses: .github/actions/smithy-kotlin-custom-gradle-distribution-url
+      # TODO: CONFIGURE THIS PROPERLY
     - name: Configure Gradle for aws-sdk-kotlin
-      uses: ./aws-sdk-kotlin/.github/actions/custom-gradle-distribution-url
+      uses: .github/actions/smithy-kotlin-custom-gradle-distribution-url
     - name: Configure JDK
       uses: actions/setup-java@v3
       with:

.github/workflows/kat-transform.yml

@@ -24,8 +24,6 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
-        with:
-          path: 'smithy-kotlin'
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -34,7 +32,7 @@ jobs:
           aws-region: us-west-2
 
       - name: Configure Gradle
-        uses: ./smithy-kotlin/.github/actions/custom-gradle-distribution-url
+        uses: .github/actions/smithy-kotlin-custom-gradle-distribution-url
 
       - name: Setup kat
         uses: awslabs/aws-kotlin-repo-tools/.github/actions/setup-kat@main

.github/workflows/lint.yml

@@ -18,10 +18,9 @@ jobs:
     steps:
     - name: Checkout sources
       uses: actions/checkout@v4
-      with:
-        path: 'smithy-kotlin'
     - name: Configure Gradle
-      uses: ./smithy-kotlin/.github/actions/custom-gradle-distribution-url
+      uses: .github/actions/smithy-kotlin-custom-gradle-distribution-url
     - name: Lint ${{ env.PACKAGE_NAME }}
+      working-directory: ./smithy-kotlin
       run: |
         ./gradlew ktlint