kotlin 1.9.0-Beta

configuration cache testing
whyoleg · May 24, 2023 · 24bb7a0 · 24bb7a0
1 parent f36b378
commit 24bb7a0
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 25 deletions.
diff --git a/.github/workflows/build-kotlin-matrix.yml b/.github/workflows/build-kotlin-matrix.yml
@@ -9,18 +9,19 @@ on:
 
 jobs:
   build:
-    name: K2=${{ matrix.kotlin-use-k2 }} ${{ matrix.kotlin-version }} P=${{ matrix.patch-file }}
+    name: K2=${{ matrix.kotlin-use-k2 }} CC=${{ matrix.configuration-cache-enabled }} K=${{ matrix.kotlin-version }}
     strategy:
       fail-fast: false
-      #max-parallel: 2
+      max-parallel: 2
       matrix:
         kotlin-version: [
           '', # empty means a current project version
           '1.8.21',
-          '[1.9.0-Beta,1.9.0-Beta-9999[',
+          '1.9.0-Beta',
           '[1.9.20-dev,1.9.20-dev-9999['
         ]
         kotlin-use-k2: [ 'false', 'true' ]
+        configuration-cache-enabled: [ false, true ]
         exclude:
           # it's possible to use K2 only starting from kotlin 1.9
           - kotlin-use-k2: 'true'
@@ -32,4 +33,5 @@ jobs:
       kotlin-version: ${{ matrix.kotlin-version }}
       kotlin-use-k2: ${{ matrix.kotlin-use-k2 }}
       patch-file: './.github/patches/K_N_workaround.patch'
+      configuration-cache-enabled: ${{ matrix.configuration-cache-enabled }}
       run-compatibility-tests: false
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -8,19 +8,21 @@ on:
       kotlin-use-k2:
         description: Use or not K2
         type: string
-        required: false
         default: 'false'
       cache-disabled:
         description: When 'true', all caching is disabled. No entries will be written to or read from the cache.
         type: boolean
-        required: false
         default: false
       patch-file:
         description: Path to git patch to apply
         type: string
+      configuration-cache-enabled:
+        description: When `true`, will use configuration cache
+        type: boolean
+        default: false
       run-compatibility-tests:
+        description: When `true`, will run compatibility tests
         type: boolean
-        required: false
         default: true
 
   workflow_dispatch:
@@ -31,19 +33,21 @@ on:
       kotlin-use-k2:
         description: Use or not K2
         type: string
-        required: false
         default: 'false'
       cache-disabled:
         description: When 'true', all caching is disabled. No entries will be written to or read from the cache.
         type: boolean
-        required: false
         default: false
       patch-file:
         description: Path to git patch to apply
         type: string
+      configuration-cache-enabled:
+        description: When `true`, will use configuration cache
+        type: boolean
+        default: false
       run-compatibility-tests:
+        description: When `true`, will run compatibility tests
         type: boolean
-        required: false
         default: true
 
 env:
@@ -65,6 +69,10 @@ jobs:
         with:
           cache-disabled: ${{ inputs.cache-disabled }}
 
+      - id: configuration-cache
+        if: ${{ inputs.configuration-cache-enabled }}
+        run: echo "ARGS=--configuration-cache" >> $GITHUB_OUTPUT
+
       - if: matrix.os == 'windows-latest'
         uses: msys2/setup-msys2@v2
         with:
@@ -77,11 +85,10 @@ jobs:
           arguments: |
             check 
             --scan
-            --continue 
-            --configuration-cache 
-            --exclude-task
-            jsPublicPackageJson 
+            --continue
             -Pkotlin.experimental.tryK2=${{ inputs.kotlin-use-k2 }}
+            -PuseKotlin=${{ inputs.kotlin-version }}
+            ${{ steps.configuration-cache.outputs.ARGS }}"
 
   compatibility-generate:
     if: ${{ inputs.run-compatibility-tests }}
@@ -99,6 +106,11 @@ jobs:
         with:
           cache-disabled: ${{ inputs.cache-disabled }}
           cache-read-only: true
+
+      - id: configuration-cache
+        if: ${{ inputs.configuration-cache-enabled }}
+        run: echo "ARGS=--configuration-cache" >> $GITHUB_OUTPUT
+
       - name: Run tests
         uses: gradle/gradle-build-action@v2
         with:
@@ -108,10 +120,9 @@ jobs:
             -Ptesttool.instanceId=${{ matrix.os }}
             --scan
             --continue
-            --configuration-cache
-            --exclude-task
-            jsPublicPackageJson
             -Pkotlin.experimental.tryK2=${{ inputs.kotlin-use-k2 }}
+            -PuseKotlin=${{ inputs.kotlin-version }}
+            ${{ steps.configuration-cache.outputs.ARGS }}"
 
       - name: ZIP test-tool-storage (windows)
         if: ${{ always() && matrix.os == 'windows-latest' }}
@@ -145,6 +156,10 @@ jobs:
           cache-disabled: ${{ inputs.cache-disabled }}
           cache-read-only: true
 
+      - id: configuration-cache
+        if: ${{ inputs.configuration-cache-enabled }}
+        run: echo "ARGS=--configuration-cache" >> $GITHUB_OUTPUT
+
       - name: Download test-tool-storage ZIP
         uses: actions/download-artifact@v3
         with:
@@ -177,10 +192,9 @@ jobs:
             -Ptesttool.instanceId=${{ matrix.os }}
             --scan
             --continue
-            --configuration-cache
-            --exclude-task
-            jsPublicPackageJson
             -Pkotlin.experimental.tryK2=${{ inputs.kotlin-use-k2 }}
+            -PuseKotlin=${{ inputs.kotlin-version }}
+            ${{ steps.configuration-cache.outputs.ARGS }}"
       # for windows, we skip jsNodeTest task, because for some reason it timeouts
       - name: Run tests (windows)
         if: matrix.os == 'windows-latest'
@@ -192,12 +206,11 @@ jobs:
             -Ptesttool.instanceId=${{ matrix.os }}
             --scan
             --continue
-            --configuration-cache
-            --exclude-task
-            jsPublicPackageJson
             --exclude-task
             jsNodeTest
             -Pkotlin.experimental.tryK2=${{ inputs.kotlin-use-k2 }}
+            -PuseKotlin=${{ inputs.kotlin-version }}
+            ${{ steps.configuration-cache.outputs.ARGS }}"
 
   build-project:
     name: Build project
@@ -214,6 +227,10 @@ jobs:
         with:
           cache-disabled: ${{ inputs.cache-disabled }}
 
+      - id: configuration-cache
+        if: ${{ inputs.configuration-cache-enabled }}
+        run: echo "ARGS=--configuration-cache" >> $GITHUB_OUTPUT
+
       - if: matrix.os == 'windows-latest'
         uses: msys2/setup-msys2@v2
         with:
@@ -230,3 +247,5 @@ jobs:
             --continue
             -Pskip.test
             -Pkotlin.experimental.tryK2=${{ inputs.kotlin-use-k2 }}
+            -PuseKotlin=${{ inputs.kotlin-version }}
+            ${{ steps.configuration-cache.outputs.ARGS }}"
diff --git a/build-parameters/build.gradle.kts b/build-parameters/build.gradle.kts
@@ -27,9 +27,7 @@ buildParameters {
             }
         }
     }
-    string("useKotlin") {
-        fromEnvironment("KOTLIN_VERSION_OVERRIDE")
-    }
+    string("useKotlin")
     group("skip") {
         bool("test") {
             description.set("Skip running tests")