From d0cf16c8a616c338b981c6b7b38935811de1530f Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Sun, 28 Feb 2021 17:06:47 +0700
Subject: [PATCH 1/5] Rework GA workflows

---
 .github/workflows/build.yml   | 110 ++++++--------------------------
 .github/workflows/deploy.yml  |  43 +++++++++++++
 .github/workflows/release.yml | 117 ----------------------------------
 build.gradle.kts              |  15 ++++-
 gradle.properties             |   1 +
 5 files changed, 75 insertions(+), 211 deletions(-)
 create mode 100644 .github/workflows/deploy.yml
 delete mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 626062abf..56f8721eb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,107 +1,35 @@
-name: Gradle build
-
+name: build
 on: [ push ]
 
 jobs:
-  build-ubuntu:
-    runs-on: ubuntu-20.04
-
+  build:
+    strategy:
+      matrix:
+        os: [ macOS-latest, windows-latest ]
+    runs-on: ${{matrix.os}}
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout the repo
+        uses: actions/checkout@v2
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
           java-version: 11
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Install Chrome
-        run: |
-          sudo apt install -y libappindicator1 fonts-liberation
-          wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-          sudo dpkg -i google-chrome*.deb
-      - name: Cache gradle
-        uses: actions/cache@v2
-        with:
-          path: |
-            .gradle
-            build
-            ~/.gradle
-          key: gradle
-          restore-keys: gradle
-
-      - name: Cache konan
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.konan/dependencies
-            ~/.konan/kotlin-native-prebuilt-linux-*
-          key: ${{ runner.os }}-konan
-          restore-keys: ${{ runner.os }}-konan
-      - name: Build with Gradle
-        run: ./gradlew -Dorg.gradle.daemon=false --build-cache build
-
-  build-osx:
-    runs-on: macos-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Cache gradle
-        uses: actions/cache@v2
-        with:
-          path: |
-            .gradle
-            build
-            ~/.gradle
-          key: gradle
-          restore-keys: gradle
-
-      - name: Cache konan
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.konan/dependencies
-            ~/.konan/kotlin-native-prebuilt-macos-*
-          key: ${{ runner.os }}-konan
-          restore-keys: ${{ runner.os }}-konan
-      - name: Build with Gradle
-        run: sudo ./gradlew -Dorg.gradle.daemon=false --build-cache build
-
-  build-windows:
-    runs-on: windows-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
       - name: Add msys to path
+        if: matrix.os == 'windows-latest'
         run: SETX PATH "%PATH%;C:\msys64\mingw64\bin"
       - name: Cache gradle
         uses: actions/cache@v2
         with:
-          path: |
-            .gradle
-            build
-            ~/.gradle
-          key: ${{ runner.os }}-gradle
-          restore-keys: ${{ runner.os }}-gradle
-
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
       - name: Cache konan
         uses: actions/cache@v2
         with:
-          path: |
-            ~/.konan/dependencies
-            ~/.konan/kotlin-native-prebuilt-mingw-*
-          key: ${{ runner.os }}-konan
-          restore-keys: ${{ runner.os }}-konan
-      - name: Build with Gradle
-        run: ./gradlew --build-cache build
+          path: ~/.konan
+          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Build
+        run: ./gradlew build --no-daemon --stacktrace
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 000000000..83be65b50
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,43 @@
+name: deploy
+on: workflow_dispatch
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [macOS-latest, windows-latest]
+    runs-on: ${{matrix.os}}
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Add msys to path
+        if: matrix.os == 'windows-latest'
+        run: SETX PATH "%PATH%;C:\msys64\mingw64\bin"
+      - name: Cache gradle
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Cache konan
+        uses: actions/cache@v2
+        with:
+          path: ~/.konan
+          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Publish Mac Artifacts
+        if: matrix.os == 'macOS-latest'
+        run: ./gradlew publish --no-daemon --stacktrace -PsonatypePublish=true -PsonatypeUser=${{ secrets.SONATYPE_USERNAME }} -PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }}
+        env:
+          signingKey: ${{ secrets.SIGNING_KEY }}
+      - name: Publish Windows Artifacts
+        if: matrix.os == 'windows-latest'
+        run: ./gradlew publish --no-daemon --stacktrace -PsonatypePublish=true -PsonatypeUser=${{ secrets.SONATYPE_USERNAME }} -PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }}
+        env:
+          signingKey: ${{ secrets.SIGNING_KEY }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 743520885..000000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-name: Gradle release
-
-on:
-  release:
-    types:
-      - created
-
-jobs:
-  build-ubuntu:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Install Chrome
-        run: |
-          sudo apt install -y libappindicator1 fonts-liberation
-          wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-          sudo dpkg -i google-chrome*.deb
-      - name: Cache gradle
-        uses: actions/cache@v2
-        with:
-          path: |
-            .gradle
-            build
-            ~/.gradle
-          key: gradle
-          restore-keys: gradle
-
-      - name: Cache konan
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.konan/dependencies
-            ~/.konan/kotlin-native-prebuilt-linux-*
-          key: ${{ runner.os }}-konan
-          restore-keys: ${{ runner.os }}-konan
-      - name: Build with Gradle
-        run: ./gradlew -Dorg.gradle.daemon=false --build-cache build
-      - name: Run release task
-        run: ./gradlew release -PbintrayUser=${{ secrets.BINTRAY_USER }} -PbintrayApiKey=${{ secrets.BINTRAY_KEY }}
-
-  build-osx:
-    runs-on: macos-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Cache gradle
-        uses: actions/cache@v2
-        with:
-          path: |
-            .gradle
-            build
-            ~/.gradle
-          key: gradle
-          restore-keys: gradle
-
-      - name: Cache konan
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.konan/dependencies
-            ~/.konan/kotlin-native-prebuilt-macos-*
-          key: ${{ runner.os }}-konan
-          restore-keys: ${{ runner.os }}-konan
-      - name: Build with Gradle
-        run: sudo ./gradlew -Dorg.gradle.daemon=false --build-cache build
-      - name: Run release task
-        run: ./gradlew release -PbintrayUser=${{ secrets.BINTRAY_USER }} -PbintrayApiKey=${{ secrets.BINTRAY_KEY }}
-
-  build-windows:
-    runs-on: windows-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Add msys to path
-        run: SETX PATH "%PATH%;C:\msys64\mingw64\bin"
-      - name: Cache gradle
-        uses: actions/cache@v2
-        with:
-          path: |
-            .gradle
-            build
-            ~/.gradle
-          key: ${{ runner.os }}-gradle
-          restore-keys: ${{ runner.os }}-gradle
-
-      - name: Cache konan
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.konan/dependencies
-            ~/.konan/kotlin-native-prebuilt-mingw-*
-          key: ${{ runner.os }}-konan
-          restore-keys: ${{ runner.os }}-konan
-      - name: Build with Gradle
-        run: ./gradlew --build-cache build
-      - name: Run release task
-        run: ./gradlew release -PbintrayUser=${{ secrets.BINTRAY_USER }} -PbintrayApiKey=${{ secrets.BINTRAY_KEY }}
-
diff --git a/build.gradle.kts b/build.gradle.kts
index 83123765d..9e2b42a3c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,5 @@
+import ru.mipt.npm.gradle.KSciencePublishingPlugin
+
 plugins {
     id("ru.mipt.npm.gradle.project")
 }
@@ -22,7 +24,14 @@ allprojects {
 }
 
 subprojects {
-    if (name.startsWith("kmath")) apply<ru.mipt.npm.gradle.KSciencePublishingPlugin>()
+    if (name.startsWith("kmath")) {
+        apply<KSciencePublishingPlugin>()
+
+        val publishWindows by tasks.creating {
+            tasks.find { it.name == "publishMingwX64PublicationToSpaceRepository" }?.let { dependsOn(it) }
+            tasks.find { it.name == "publishMingwX64PublicationToSonatypeRepository" }?.let { dependsOn(it) }
+        }
+    }
 }
 
 readme {
@@ -35,6 +44,6 @@ ksciencePublish {
     githubProject = "kmath"
 }
 
-apiValidation{
+apiValidation {
     nonPublicMarkers.add("space.kscience.kmath.misc.UnstableKMathAPI")
-}
\ No newline at end of file
+}
diff --git a/gradle.properties b/gradle.properties
index 88b90f27b..1a2a263ac 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,6 +3,7 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.stability.nowarn=true
 kotlin.native.enableDependencyPropagation=false
 kotlin.parallel.tasks.in.project=true
+org.gradle.configureondemand=true
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
 org.gradle.parallel=true
 systemProp.org.gradle.internal.publish.checksums.insecure=true
-- 
2.34.1


From 13792b07b2eb9670654d52b44eefc739820bad90 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Sun, 28 Feb 2021 17:14:41 +0700
Subject: [PATCH 2/5] Add Touchlab notice

---
 .github/workflows/build.yml  | 2 ++
 .github/workflows/deploy.yml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 56f8721eb..3b9005997 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,3 +1,5 @@
+# Based on https://github.com/touchlab/Stately/blob/main/.github/workflows/build.yml
+
 name: build
 on: [ push ]
 
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 83be65b50..40a703309 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,3 +1,5 @@
+# Based on https://github.com/touchlab/Stately/blob/main/.github/workflows/deploy.yml
+
 name: deploy
 on: workflow_dispatch
 
-- 
2.34.1


From a68b102e401ab7524de30130f11487ca931c3151 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Sun, 28 Feb 2021 20:23:02 +0700
Subject: [PATCH 3/5] Update deploy.yml

---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 40a703309..9fcdec036 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -35,11 +35,11 @@ jobs:
             ${{ runner.os }}-gradle-
       - name: Publish Mac Artifacts
         if: matrix.os == 'macOS-latest'
-        run: ./gradlew publish --no-daemon --stacktrace -PsonatypePublish=true -PsonatypeUser=${{ secrets.SONATYPE_USERNAME }} -PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }}
+        run: ./gradlew publishAllPublicationsToSpaceRepository publishAllPublicationsToSonatypeRepository --no-daemon --stacktrace -PsonatypePublish=true -PsonatypeUser=${{ secrets.SONATYPE_USERNAME }} -PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }}
         env:
           signingKey: ${{ secrets.SIGNING_KEY }}
       - name: Publish Windows Artifacts
         if: matrix.os == 'windows-latest'
-        run: ./gradlew publish --no-daemon --stacktrace -PsonatypePublish=true -PsonatypeUser=${{ secrets.SONATYPE_USERNAME }} -PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }}
+        run: ./gradlew publishMingwX64PublicationToSpaceRepository publishMingwX64PublicationToSonatypeRepository --no-daemon --stacktrace -PsonatypePublish=true -PsonatypeUser=${{ secrets.SONATYPE_USERNAME }} -PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }}
         env:
           signingKey: ${{ secrets.SIGNING_KEY }}
-- 
2.34.1


From 4ec33c6857f164ae58dc5408eb4180b7b26dbcd1 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Sun, 28 Feb 2021 20:23:16 +0700
Subject: [PATCH 4/5] Remove publishWindows task

---
 build.gradle.kts | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9e2b42a3c..cb3cb1a3b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,14 +24,7 @@ allprojects {
 }
 
 subprojects {
-    if (name.startsWith("kmath")) {
-        apply<KSciencePublishingPlugin>()
-
-        val publishWindows by tasks.creating {
-            tasks.find { it.name == "publishMingwX64PublicationToSpaceRepository" }?.let { dependsOn(it) }
-            tasks.find { it.name == "publishMingwX64PublicationToSonatypeRepository" }?.let { dependsOn(it) }
-        }
-    }
+    if (name.startsWith("kmath")) apply<KSciencePublishingPlugin>()
 }
 
 readme {
-- 
2.34.1


From 30bd56d0f71261d20533d8720500be6faf96d265 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Sun, 28 Feb 2021 21:29:21 +0700
Subject: [PATCH 5/5] Support space credentials

---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9fcdec036..997755816 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -35,11 +35,11 @@ jobs:
             ${{ runner.os }}-gradle-
       - name: Publish Mac Artifacts
         if: matrix.os == 'macOS-latest'
-        run: ./gradlew publishAllPublicationsToSpaceRepository publishAllPublicationsToSonatypeRepository --no-daemon --stacktrace -PsonatypePublish=true -PsonatypeUser=${{ secrets.SONATYPE_USERNAME }} -PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }}
+        run: ./gradlew publishAllPublicationsToSpaceRepository publishAllPublicationsToSonatypeRepository --no-daemon --stacktrace -PsonatypePublish=true -PsonatypeUser=${{ secrets.SONATYPE_USERNAME }} -PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }} -PspaceUser=${{ secrets.SPACE_USERNAME }} -PspacePassword=${{ secrets.SPACE_PASSWORD }}
         env:
           signingKey: ${{ secrets.SIGNING_KEY }}
       - name: Publish Windows Artifacts
         if: matrix.os == 'windows-latest'
-        run: ./gradlew publishMingwX64PublicationToSpaceRepository publishMingwX64PublicationToSonatypeRepository --no-daemon --stacktrace -PsonatypePublish=true -PsonatypeUser=${{ secrets.SONATYPE_USERNAME }} -PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }}
+        run: ./gradlew publishAllPublicationsToSpaceRepository publishAllPublicationsToSonatypeRepository --no-daemon --stacktrace -PsonatypePublish=true -PsonatypeUser=${{ secrets.SONATYPE_USERNAME }} -PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }} -PspaceUser=${{ secrets.SPACE_USERNAME }} -PspacePassword=${{ secrets.SPACE_PASSWORD }}
         env:
           signingKey: ${{ secrets.SIGNING_KEY }}
-- 
2.34.1