GitHub Actions: Don't download nodejs from Kotlin/JS.

rhdunn · Mar 17, 2023 · 6cba400 · 6cba400
1 parent 91ac222
commit 6cba400
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 10 deletions.
diff --git a/.github/workflows/build-js-ir.yml b/.github/workflows/build-js-ir.yml
@@ -14,7 +14,7 @@ jobs:
           gradle-version: 7.5
 
       - name: Build for Kotlin/JS IR
-        run: gradle jsIrJar
+        run: gradle -D nodejs.download=false jsIrJar
 
       - name: Tar Build Artifacts
         run: tar -cvf build-js-ir-artifacts.tar .
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [ 14, 16, 18 ]
+        node: [ 16, 18 ]
     steps:
       - name: Setup Gradle 7.5
         uses: gradle/gradle-build-action@v2
@@ -51,7 +51,7 @@ jobs:
           node-version: ${{ matrix.node }}
 
       - name: Test for Kotlin/JS IR on Node
-        run: gradle jsIrNodeTest
+        run: gradle -D nodejs.download=false jsIrNodeTest
 
   test-firefox:
     needs: build
@@ -76,7 +76,7 @@ jobs:
           firefox-version: 'latest'
 
       - name: Test for Kotlin/JS IR on Firefox
-        run: gradle -D js.browser=Firefox jsIrBrowserTest
+        run: gradle -D nodejs.download=false -D js.browser=Firefox jsIrBrowserTest
 
   test-chrome:
     needs: build
@@ -101,4 +101,4 @@ jobs:
           chrome-version: 'latest'
 
       - name: Test for Kotlin/JS Legacy on Chrome
-        run: gradle -D js.browser=Chrome jsLegacyBrowserTest
+        run: gradle -D nodejs.download=false -D js.browser=Chrome jsLegacyBrowserTest
diff --git a/.github/workflows/build-js-legacy.yml b/.github/workflows/build-js-legacy.yml
@@ -14,7 +14,7 @@ jobs:
           gradle-version: 7.5
 
       - name: Build for Kotlin/JS Legacy
-        run: gradle jsLegacyJar
+        run: gradle -D nodejs.download=false jsLegacyJar
 
       - name: Tar Build Artifacts
         run: tar -cvf build-js-legacy-artifacts.tar .
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [ 14, 16, 18 ]
+        node: [ 16, 18 ]
     steps:
       - name: Setup Gradle 7.5
         uses: gradle/gradle-build-action@v2
@@ -51,7 +51,7 @@ jobs:
           node-version: ${{ matrix.node }}
 
       - name: Test for Kotlin/JS Legacy on Node
-        run: gradle jsLegacyNodeTest
+        run: gradle -D nodejs.download=false jsLegacyNodeTest
 
   test-firefox:
     needs: build
@@ -76,7 +76,7 @@ jobs:
           firefox-version: 'latest'
 
       - name: Test for Kotlin/JS Legacy on Firefox
-        run: gradle -D js.browser=Firefox jsLegacyBrowserTest
+        run: gradle -D nodejs.download=false -D js.browser=Firefox jsLegacyBrowserTest
 
   test-chrome:
     needs: build
@@ -101,4 +101,4 @@ jobs:
           chrome-version: 'latest'
 
       - name: Test for Kotlin/JS Legacy on Chrome
-        run: gradle -D js.browser=Chrome jsLegacyBrowserTest
+        run: gradle -D nodejs.download=false -D js.browser=Chrome jsLegacyBrowserTest
diff --git a/src/xqt-kotlinx-test/build.gradle.kts b/src/xqt-kotlinx-test/build.gradle.kts
@@ -2,6 +2,11 @@ plugins {
     kotlin("multiplatform") version "1.7.20"
 }
 
+rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
+    rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().download =
+        System.getProperty("nodejs.download") != "false"
+}
+
 kotlin {
     jvm {
         compilations.all {

diff --git a/src/xqt-platform-ft/build.gradle.kts b/src/xqt-platform-ft/build.gradle.kts
@@ -6,6 +6,11 @@ plugins {
 group = "xqt-platform"
 version = "0.1-SNAPSHOT"
 
+rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
+    rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().download =
+        System.getProperty("nodejs.download") != "false"
+}
+
 kotlin {
     jvm {
         compilations.all {

diff --git a/src/xqt-platform-marklogic/build.gradle.kts b/src/xqt-platform-marklogic/build.gradle.kts
@@ -6,6 +6,11 @@ plugins {
 group = "xqt-platform"
 version = "0.1-SNAPSHOT"
 
+rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
+    rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().download =
+        System.getProperty("nodejs.download") != "false"
+}
+
 kotlin {
     jvm {
         compilations.all {

diff --git a/src/xqt-platform-saxon/build.gradle.kts b/src/xqt-platform-saxon/build.gradle.kts
@@ -6,6 +6,11 @@ plugins {
 group = "xqt-platform"
 version = "0.1-SNAPSHOT"
 
+rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
+    rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().download =
+        System.getProperty("nodejs.download") != "false"
+}
+
 kotlin {
     jvm {
         compilations.all {

diff --git a/src/xqt-platform-xml/build.gradle.kts b/src/xqt-platform-xml/build.gradle.kts
@@ -6,6 +6,11 @@ plugins {
 group = "xqt-platform"
 version = "0.1-SNAPSHOT"
 
+rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
+    rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().download =
+        System.getProperty("nodejs.download") != "false"
+}
+
 kotlin {
     jvm {
         compilations.all {

diff --git a/src/xqt-platform-xpath/build.gradle.kts b/src/xqt-platform-xpath/build.gradle.kts
@@ -6,6 +6,11 @@ plugins {
 group = "xqt-platform"
 version = "0.1-SNAPSHOT"
 
+rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
+    rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().download =
+        System.getProperty("nodejs.download") != "false"
+}
+
 kotlin {
     jvm {
         compilations.all {

diff --git a/src/xqt-platform-xslt/build.gradle.kts b/src/xqt-platform-xslt/build.gradle.kts
@@ -6,6 +6,11 @@ plugins {
 group = "xqt-platform"
 version = "0.1-SNAPSHOT"
 
+rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
+    rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().download =
+        System.getProperty("nodejs.download") != "false"
+}
+
 kotlin {
     jvm {
         compilations.all {