GitHub Actions: Switch to the gradle setup action.

rhdunn · Mar 17, 2023 · 91ac222 · 91ac222
1 parent 115e29c
commit 91ac222
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 40 deletions.
diff --git a/.github/workflows/build-js-ir.yml b/.github/workflows/build-js-ir.yml
@@ -8,16 +8,13 @@ jobs:
       - name: Source Code Checkout
         uses: actions/checkout@v3
 
-      - name: Create a Gradle Wrapper
-        # Use a null gradle file so that if the gradle version cannot parse this gradle
-        # file it will be able to run and generate the gradle wrapper.
-        run: touch null.gradle ; gradle -b null.gradle wrapper --gradle-version 7.5 ; rm null.gradle
-
-      - name: Gradle Version
-        run: ./gradlew --version
+      - name: Setup Gradle 7.5
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: 7.5
 
       - name: Build for Kotlin/JS IR
-        run: ./gradlew jsIrJar
+        run: gradle jsIrJar
 
       - name: Tar Build Artifacts
         run: tar -cvf build-js-ir-artifacts.tar .
@@ -35,6 +32,11 @@ jobs:
       matrix:
         node: [ 14, 16, 18 ]
     steps:
+      - name: Setup Gradle 7.5
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: 7.5
+
       - name: Download Build Artifacts
         uses: actions/download-artifact@v3
         with:
@@ -49,12 +51,17 @@ jobs:
           node-version: ${{ matrix.node }}
 
       - name: Test for Kotlin/JS IR on Node
-        run: ./gradlew jsIrNodeTest
+        run: gradle jsIrNodeTest
 
   test-firefox:
     needs: build
     runs-on: ubuntu-latest
     steps:
+      - name: Setup Gradle 7.5
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: 7.5
+
       - name: Download Build Artifacts
         uses: actions/download-artifact@v3
         with:
@@ -69,12 +76,17 @@ jobs:
           firefox-version: 'latest'
 
       - name: Test for Kotlin/JS IR on Firefox
-        run: ./gradlew -D js.browser=Firefox jsIrBrowserTest
+        run: gradle -D js.browser=Firefox jsIrBrowserTest
 
   test-chrome:
     needs: build
     runs-on: ubuntu-latest
     steps:
+      - name: Setup Gradle 7.5
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: 7.5
+
       - name: Download Build Artifacts
         uses: actions/download-artifact@v3
         with:
@@ -89,4 +101,4 @@ jobs:
           chrome-version: 'latest'
 
       - name: Test for Kotlin/JS Legacy on Chrome
-        run: ./gradlew -D js.browser=Chrome jsLegacyBrowserTest
+        run: gradle -D js.browser=Chrome jsLegacyBrowserTest
diff --git a/.github/workflows/build-js-legacy.yml b/.github/workflows/build-js-legacy.yml
@@ -8,16 +8,13 @@ jobs:
       - name: Source Code Checkout
         uses: actions/checkout@v3
 
-      - name: Create a Gradle Wrapper
-        # Use a null gradle file so that if the gradle version cannot parse this gradle
-        # file it will be able to run and generate the gradle wrapper.
-        run: touch null.gradle ; gradle -b null.gradle wrapper --gradle-version 7.5 ; rm null.gradle
-
-      - name: Gradle Version
-        run: ./gradlew --version
+      - name: Setup Gradle 7.5
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: 7.5
 
       - name: Build for Kotlin/JS Legacy
-        run: ./gradlew jsLegacyJar
+        run: gradle jsLegacyJar
 
       - name: Tar Build Artifacts
         run: tar -cvf build-js-legacy-artifacts.tar .
@@ -35,6 +32,11 @@ jobs:
       matrix:
         node: [ 14, 16, 18 ]
     steps:
+      - name: Setup Gradle 7.5
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: 7.5
+
       - name: Download Build Artifacts
         uses: actions/download-artifact@v3
         with:
@@ -49,12 +51,17 @@ jobs:
           node-version: ${{ matrix.node }}
 
       - name: Test for Kotlin/JS Legacy on Node
-        run: ./gradlew jsLegacyNodeTest
+        run: gradle jsLegacyNodeTest
 
   test-firefox:
     needs: build
     runs-on: ubuntu-latest
     steps:
+      - name: Setup Gradle 7.5
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: 7.5
+
       - name: Download Build Artifacts
         uses: actions/download-artifact@v3
         with:
@@ -69,12 +76,17 @@ jobs:
           firefox-version: 'latest'
 
       - name: Test for Kotlin/JS Legacy on Firefox
-        run: ./gradlew -D js.browser=Firefox jsLegacyBrowserTest
+        run: gradle -D js.browser=Firefox jsLegacyBrowserTest
 
   test-chrome:
     needs: build
     runs-on: ubuntu-latest
     steps:
+      - name: Setup Gradle 7.5
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: 7.5
+
       - name: Download Build Artifacts
         uses: actions/download-artifact@v3
         with:
@@ -89,4 +101,4 @@ jobs:
           chrome-version: 'latest'
 
       - name: Test for Kotlin/JS Legacy on Chrome
-        run: ./gradlew -D js.browser=Chrome jsLegacyBrowserTest
+        run: gradle -D js.browser=Chrome jsLegacyBrowserTest
diff --git a/.github/workflows/build-jvm.yml b/.github/workflows/build-jvm.yml
@@ -17,16 +17,13 @@ jobs:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
 
-      - name: Create a Gradle Wrapper
-        # Use a null gradle file so that if the gradle version cannot parse this gradle
-        # file it will be able to run and generate the gradle wrapper.
-        run: touch null.gradle ; gradle -b null.gradle wrapper --gradle-version 7.5 ; rm null.gradle
-
-      - name: Gradle Version
-        run: ./gradlew --version
+      - name: Setup Gradle 7.5
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: 7.5
 
       - name: Build for Kotlin/JVM
-        run: ./gradlew -D jvm.target=${{ matrix.java }} jvmJar
+        run: gradle -D jvm.target=${{ matrix.java }} jvmJar
 
       - name: Test for Kotlin/JVM
-        run: ./gradlew -D jvm.target=${{ matrix.java }} jvmTest
+        run: gradle -D jvm.target=${{ matrix.java }} jvmTest
diff --git a/.github/workflows/build-native.yml b/.github/workflows/build-native.yml
@@ -11,16 +11,13 @@ jobs:
       - name: Source Code Checkout
         uses: actions/checkout@v3
 
-      - name: Create a Gradle Wrapper
-        # Use a null gradle file so that if the gradle version cannot parse this gradle
-        # file it will be able to run and generate the gradle wrapper.
-        run: touch null.gradle ; gradle -b null.gradle wrapper --gradle-version 7.5 ; rm null.gradle
-
-      - name: Gradle Version
-        run: ./gradlew --version
+      - name: Setup Gradle 7.5
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: 7.5
 
       - name: Build for Kotlin/Native
-        run: ./gradlew nativeMainKlibrary
+        run: gradle nativeMainKlibrary
 
       - name: Test for Kotlin/Native
-        run: ./gradlew nativeTest
+        run: gradle nativeTest