fanout

awslabs · Oct 10, 2023 · c3bb626 · c3bb626
1 parent a4f03f9
commit c3bb626
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 18 deletions.
diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml
@@ -29,5 +29,6 @@ runs:
       shell: bash
       run: |
         pushd "$GITHUB_WORKSPACE/smithy-kotlin"
-        ./gradlew assemble publishToMavenLocal
+        ./gradlew --parallel assemble 
+        ./gradlew publishToMavenLocal
         popd
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -4,9 +4,6 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches:
-      - main
-      - 'feat-*'
   workflow_dispatch:
 
 # Allow one instance of this workflow per pull request, and cancel older runs when new changes are pushed
@@ -15,16 +12,20 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  BUILDER_VERSION: v0.8.22
-  BUILDER_SOURCE: releases
-  # host owned by CRT team to host aws-crt-builder releases. Contact their on-call with any issues
-  BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
-  PACKAGE_NAME: aws-sdk-kotlin
   RUN: ${{ github.run_id }}-${{ github.run_number }}
+  GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dkotlin.incremental=false"
 
 jobs:
-  linux-compat:
+  jvm:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java-version:
+          - 8
+          - 11
+          - 17
+          - 19
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -33,17 +34,35 @@ jobs:
       - name: Setup Build
         uses: ./aws-sdk-kotlin/.github/actions/setup-build
       - name: Test
+        working-directory: ./aws-sdk-kotlin
+        shell: bash
         run: |
           pwd
           ls -lsa
-          pushd "$GITHUB_WORKSPACE/aws-sdk-kotlin"
+          ./gradlew -Djava.test.version=${{ matrix.java-version }} jvmTest --stacktrace",
+
+  all-platforms:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest, macos-latest, windows-2019 ]
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          path: 'aws-sdk-kotlin'
+      - name: Setup Build
+        uses: ./aws-sdk-kotlin/.github/actions/setup-build
+      - name: Test
+        working-directory: ./aws-sdk-kotlin
+        shell: bash
+        run: |
+          pwd
+          systeminfo
           ./gradlew publishToMavenLocal
           ./gradlew apiCheck
-          ./gradlew test allTests",
-          systeminfo
-          ./gradlew --status
-          ./gradlew --stop
-          systeminfo
+          ./gradlew test allTests
           ./gradlew testAllProtocols
 
 #  linux-compat:

diff --git a/codegen/smithy-aws-kotlin-codegen/build.gradle.kts b/codegen/smithy-aws-kotlin-codegen/build.gradle.kts
@@ -62,8 +62,8 @@ tasks.compileTestKotlin {
 }
 
 tasks.withType<JavaCompile> {
-    sourceCompatibility = JavaVersion.valueOf(kotlinJVMTargetVersion).toString()
-    targetCompatibility = JavaVersion.valueOf(kotlinJVMTargetVersion).toString()
+    sourceCompatibility = JavaVersion.toVersion(kotlinJVMTargetVersion).toString()
+    targetCompatibility = JavaVersion.toVersion(kotlinJVMTargetVersion).toString()
 }
 
 // Reusable license copySpec