From 0a39bed67f8c4b62ae2bc45fbf027d3dfdbc4614 Mon Sep 17 00:00:00 2001
From: i-walker <46971368+i-walker@users.noreply.github.com>
Date: Mon, 13 Sep 2021 15:59:13 +0200
Subject: [PATCH 01/18] add targets

---
 .../kotlin/arrow/fx/coroutines/predef.kt                    | 6 ++++++
 .../src/macosArm64Main/kotlin/arrow/fx/coroutines/predef.kt | 6 ++++++
 .../kotlin/arrow/fx/coroutines/predef.kt                    | 6 ++++++
 3 files changed, 18 insertions(+)
 create mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/iosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt
 create mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/macosArm64Main/kotlin/arrow/fx/coroutines/predef.kt
 create mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/watchosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt

diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/iosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/iosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt
new file mode 100644
index 00000000000..96685114130
--- /dev/null
+++ b/arrow-libs/fx/arrow-fx-coroutines/src/iosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt
@@ -0,0 +1,6 @@
+package arrow.fx.coroutines
+
+import kotlin.system.getTimeMillis
+
+public actual fun timeInMillis(): Long =
+  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/macosArm64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/macosArm64Main/kotlin/arrow/fx/coroutines/predef.kt
new file mode 100644
index 00000000000..96685114130
--- /dev/null
+++ b/arrow-libs/fx/arrow-fx-coroutines/src/macosArm64Main/kotlin/arrow/fx/coroutines/predef.kt
@@ -0,0 +1,6 @@
+package arrow.fx.coroutines
+
+import kotlin.system.getTimeMillis
+
+public actual fun timeInMillis(): Long =
+  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/watchosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/watchosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt
new file mode 100644
index 00000000000..96685114130
--- /dev/null
+++ b/arrow-libs/fx/arrow-fx-coroutines/src/watchosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt
@@ -0,0 +1,6 @@
+package arrow.fx.coroutines
+
+import kotlin.system.getTimeMillis
+
+public actual fun timeInMillis(): Long =
+  getTimeMillis()

From 70b8effd5165a2173f9ea0c45a8526f5623b7399 Mon Sep 17 00:00:00 2001
From: i-walker <46971368+i-walker@users.noreply.github.com>
Date: Mon, 13 Sep 2021 16:31:07 +0200
Subject: [PATCH 02/18] run tests

---
 .github/workflows/pull_request.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 837c556e289..064f9df5dc7 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -155,7 +155,9 @@ jobs:
 
       - name: Build
         working-directory: arrow-libs
-        run: ./gradlew macosX64Test iosX64Test
+        run: |
+           ./gradlew macosX64Test iosX64Test macosArm64Test iosArm64TestKlibrary
+           iosArm64TestKlibrary iosArm32TestBinaries iosArm32TestKlibrary iosSimulatorArm64Test
 
       - name: "Prepare test reports"
         if: ${{ always() }}
@@ -195,7 +197,9 @@ jobs:
 
       - name: Build
         working-directory: arrow-libs
-        run: ./gradlew tvosX64Test watchosX64Test
+        run: |
+        ./gradlew tvosX64Test tvosArm64Test watchosX64Test watchosX86Test watchosSimulatorArm64Test tvosSimulatorArm64Test
+        watchosArm32TestBinaries watchosArm32TestKlibrary  watchosArm64TestBinaries watchosArm64TestKlibrary
 
       - name: "Prepare test reports"
         if: ${{ always() }}

From 0df55b1b964672c39a3e1bcc7b839fa564c30b45 Mon Sep 17 00:00:00 2001
From: i-walker <46971368+i-walker@users.noreply.github.com>
Date: Mon, 13 Sep 2021 16:36:38 +0200
Subject: [PATCH 03/18] fiix

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

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 064f9df5dc7..ae17a48fc3b 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -155,8 +155,7 @@ jobs:
 
       - name: Build
         working-directory: arrow-libs
-        run: |
-           ./gradlew macosX64Test iosX64Test macosArm64Test iosArm64TestKlibrary
+        run: ./gradlew macosX64Test iosX64Test macosArm64Test iosArm64TestKlibrary \
            iosArm64TestKlibrary iosArm32TestBinaries iosArm32TestKlibrary iosSimulatorArm64Test
 
       - name: "Prepare test reports"
@@ -197,8 +196,7 @@ jobs:
 
       - name: Build
         working-directory: arrow-libs
-        run: |
-        ./gradlew tvosX64Test tvosArm64Test watchosX64Test watchosX86Test watchosSimulatorArm64Test tvosSimulatorArm64Test
+        run: ./gradlew tvosX64Test tvosArm64Test watchosX64Test watchosX86Test watchosSimulatorArm64Test tvosSimulatorArm64Test \
         watchosArm32TestBinaries watchosArm32TestKlibrary  watchosArm64TestBinaries watchosArm64TestKlibrary
 
       - name: "Prepare test reports"

From 1b2b4fa63afb6f28741e6ff8f03e3c0900d611a3 Mon Sep 17 00:00:00 2001
From: i-walker <46971368+i-walker@users.noreply.github.com>
Date: Mon, 13 Sep 2021 16:39:23 +0200
Subject: [PATCH 04/18] fix

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

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index ae17a48fc3b..f674e60dfc5 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -155,8 +155,7 @@ jobs:
 
       - name: Build
         working-directory: arrow-libs
-        run: ./gradlew macosX64Test iosX64Test macosArm64Test iosArm64TestKlibrary \
-           iosArm64TestKlibrary iosArm32TestBinaries iosArm32TestKlibrary iosSimulatorArm64Test
+        run: ./gradlew macosX64Test iosX64Test macosArm64Test iosArm64TestKlibrary iosArm64TestKlibrary iosArm32TestBinaries iosArm32TestKlibrary iosSimulatorArm64Test
 
       - name: "Prepare test reports"
         if: ${{ always() }}
@@ -196,8 +195,7 @@ jobs:
 
       - name: Build
         working-directory: arrow-libs
-        run: ./gradlew tvosX64Test tvosArm64Test watchosX64Test watchosX86Test watchosSimulatorArm64Test tvosSimulatorArm64Test \
-        watchosArm32TestBinaries watchosArm32TestKlibrary  watchosArm64TestBinaries watchosArm64TestKlibrary
+        run: ./gradlew tvosX64Test tvosArm64Test watchosX64Test watchosX86Test watchosSimulatorArm64Test tvosSimulatorArm64Test watchosArm32TestBinaries watchosArm32TestKlibrary  watchosArm64TestBinaries watchosArm64TestKlibrary
 
       - name: "Prepare test reports"
         if: ${{ always() }}

From cbd45c81ddc1f08c417e4ec56b8f90de3d111e04 Mon Sep 17 00:00:00 2001
From: i-walker <46971368+i-walker@users.noreply.github.com>
Date: Mon, 13 Sep 2021 16:48:16 +0200
Subject: [PATCH 05/18] fix testt

---
 .github/workflows/pull_request.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index f674e60dfc5..24293e7a00c 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -195,7 +195,7 @@ jobs:
 
       - name: Build
         working-directory: arrow-libs
-        run: ./gradlew tvosX64Test tvosArm64Test watchosX64Test watchosX86Test watchosSimulatorArm64Test tvosSimulatorArm64Test watchosArm32TestBinaries watchosArm32TestKlibrary  watchosArm64TestBinaries watchosArm64TestKlibrary
+        run: ./gradlew tvosX64Test watchosX64Test watchosX86Test watchosSimulatorArm64Test tvosSimulatorArm64Test tvosArm32TestBinaries tvosArm32TestKlibrary watchosArm32TestBinaries watchosArm32TestKlibrary watchosArm64TestBinaries watchosArm64TestKlibrary
 
       - name: "Prepare test reports"
         if: ${{ always() }}

From 966ba1a287ccd84468e00f42fd37d767ccaa4067 Mon Sep 17 00:00:00 2001
From: i-walker <46971368+i-walker@users.noreply.github.com>
Date: Mon, 13 Sep 2021 16:53:29 +0200
Subject: [PATCH 06/18] fix test

---
 .github/workflows/pull_request.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 24293e7a00c..e3719c20fc9 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -195,7 +195,7 @@ jobs:
 
       - name: Build
         working-directory: arrow-libs
-        run: ./gradlew tvosX64Test watchosX64Test watchosX86Test watchosSimulatorArm64Test tvosSimulatorArm64Test tvosArm32TestBinaries tvosArm32TestKlibrary watchosArm32TestBinaries watchosArm32TestKlibrary watchosArm64TestBinaries watchosArm64TestKlibrary
+        run: ./gradlew tvosX64Test watchosX64Test watchosX86Test watchosSimulatorArm64Test tvosSimulatorArm64Test tvosArm64TestBinaries tvosArm64TestKlibrary watchosArm32TestBinaries watchosArm32TestKlibrary watchosArm64TestBinaries watchosArm64TestKlibrary
 
       - name: "Prepare test reports"
         if: ${{ always() }}

From fd49ed243251125a16a15ccbde2b795c3f8a1165 Mon Sep 17 00:00:00 2001
From: i-walker <46971368+i-walker@users.noreply.github.com>
Date: Mon, 13 Sep 2021 17:21:14 +0200
Subject: [PATCH 07/18] push

---
 .../kotlin/arrow/fx/coroutines/predef.kt                    | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/tvosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt

diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/tvosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/tvosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt
new file mode 100644
index 00000000000..96685114130
--- /dev/null
+++ b/arrow-libs/fx/arrow-fx-coroutines/src/tvosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt
@@ -0,0 +1,6 @@
+package arrow.fx.coroutines
+
+import kotlin.system.getTimeMillis
+
+public actual fun timeInMillis(): Long =
+  getTimeMillis()

From d1e1c234193b6255e2128d138ff7c945569b23e6 Mon Sep 17 00:00:00 2001
From: i-walker <46971368+i-walker@users.noreply.github.com>
Date: Mon, 13 Sep 2021 18:10:22 +0200
Subject: [PATCH 08/18] run tvos and watchos tests seperatly

---
 .github/workflows/publish.yml      | 26 +++++++++++++--
 .github/workflows/pull_request.yml | 51 ++++++++++++++++++++++++++++--
 2 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index daad2b3e544..2819ae0b105 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -121,7 +121,7 @@ jobs:
         working-directory: arrow-libs
         run: ./gradlew publishIosSimulatorArm64PublicationToMavenRepository
 
-  publish_tvos_and_watchos:
+  publish_tvos:
     runs-on: macos-latest
     timeout-minutes: 20
 
@@ -154,6 +154,27 @@ jobs:
         working-directory: arrow-libs
         run: ./gradlew publishTvosSimulatorArm64PublicationToMavenRepository
 
+  publish_watchos:
+    runs-on: macos-latest
+    timeout-minutes: 20
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Restore Gradle cache
+        id: cache
+        uses: actions/cache@v2.1.6
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            ~/.konan
+          key: watchos-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            watchos-step-gradle-
+
       - name: Publish watchosX64
         working-directory: arrow-libs
         run: ./gradlew publishWatchosX64PublicationToMavenRepository
@@ -174,7 +195,6 @@ jobs:
         working-directory: arrow-libs
         run: ./gradlew publishWatchosSimulatorArm64PublicationToMavenRepository
 
-
   publish_windows:
     runs-on: windows-latest
     timeout-minutes: 20
@@ -199,8 +219,8 @@ jobs:
       - name: Publish MingwX64
         working-directory: arrow-libs
         run: ./gradlew publishMingwX64PublicationToMavenRepository
-  publish-arrow-stack:
 
+  publish-arrow-stack:
     runs-on: macos-latest
     defaults:
       run:
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index e3719c20fc9..18c8e9f1cb3 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -51,6 +51,7 @@ jobs:
       - name: "Validate documentation"
         working-directory: arrow-site
         run: ./gradlew runAnk
+
   js:
     runs-on: ubuntu-latest
     timeout-minutes: 20
@@ -132,6 +133,7 @@ jobs:
         with:
           name: test-reports
           path: test-reports
+
   macos_and_ios:
     runs-on: macos-latest
     timeout-minutes: 20
@@ -172,9 +174,10 @@ jobs:
         with:
           name: test-reports
           path: test-reports
-  tvos_and_watchos:
+
+  tvos:
     runs-on: macos-latest
-    timeout-minutes: 20
+    timeout-minutes: 40
 
     steps:
       - uses: actions/checkout@v2
@@ -195,7 +198,7 @@ jobs:
 
       - name: Build
         working-directory: arrow-libs
-        run: ./gradlew tvosX64Test watchosX64Test watchosX86Test watchosSimulatorArm64Test tvosSimulatorArm64Test tvosArm64TestBinaries tvosArm64TestKlibrary watchosArm32TestBinaries watchosArm32TestKlibrary watchosArm64TestBinaries watchosArm64TestKlibrary
+        run: ./gradlew tvosX64Test tvosSimulatorArm64Test tvosArm64TestBinaries tvosArm64TestKlibrary
 
       - name: "Prepare test reports"
         if: ${{ always() }}
@@ -212,6 +215,48 @@ jobs:
         with:
           name: test-reports
           path: test-reports
+
+  watchos:
+    runs-on: macos-latest
+    timeout-minutes: 35
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Restore Gradle cache
+        id: cache
+        uses: actions/cache@v2.1.6
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            ~/.konan
+          key: watchos-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            watchos-step-gradle-
+
+      - name: Build
+        working-directory: arrow-libs
+        run: ./gradlew watchosX64Test watchosX86Test watchosSimulatorArm64Test watchosArm32TestBinaries watchosArm32TestKlibrary watchosArm64TestBinaries watchosArm64TestKlibrary
+
+      - name: "Prepare test reports"
+        if: ${{ always() }}
+        run: |
+          mkdir test-reports
+          for report in `ls -d arrow-libs/**/**/build/reports/tests`; do
+            module=$(echo $report | cut -d/ -f3)
+            cp -r $report test-reports/$module
+          done
+
+      - name: "Make test reports available to download"
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v1
+        with:
+          name: test-reports
+          path: test-reports
+
   windows:
     runs-on: windows-latest
     timeout-minutes: 20

From 74a06533fbc6d1ab171fa7112cf733d3b3578070 Mon Sep 17 00:00:00 2001
From: i-walker <46971368+i-walker@users.noreply.github.com>
Date: Mon, 13 Sep 2021 18:27:46 +0200
Subject: [PATCH 09/18] fix

---
 .github/workflows/pull_request.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 18c8e9f1cb3..0c8fea28622 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -157,7 +157,7 @@ jobs:
 
       - name: Build
         working-directory: arrow-libs
-        run: ./gradlew macosX64Test iosX64Test macosArm64Test iosArm64TestKlibrary iosArm64TestKlibrary iosArm32TestBinaries iosArm32TestKlibrary iosSimulatorArm64Test
+        run: ./gradlew macosX64Test iosX64Test macosArm64Test iosSimulatorArm64Test iosArm64TestBinaries iosArm64TestKlibrary iosArm32TestBinaries iosArm32TestKlibrary
 
       - name: "Prepare test reports"
         if: ${{ always() }}

From 3a23cd0ead3b7e25254c8588676ca78d98ba1a25 Mon Sep 17 00:00:00 2001
From: i-walker <46971368+i-walker@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:48:17 +0200
Subject: [PATCH 10/18] fix

---
 .github/workflows/publish.yml      | 31 ++++++++++++++++++---
 .github/workflows/pull_request.yml | 44 +++++++++++++++++++++++++++++-
 2 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 2819ae0b105..79b8013d756 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -187,14 +187,37 @@ jobs:
         working-directory: arrow-libs
         run: ./gradlew publishWatchosArm32PublicationToMavenRepository
 
-      - name: Publish watchosArm64
-        working-directory: arrow-libs
-        run: ./gradlew publishWatchosArm64PublicationToMavenRepository
-
       - name: Publish watchosSimulatorArm64
         working-directory: arrow-libs
         run: ./gradlew publishWatchosSimulatorArm64PublicationToMavenRepository
 
+  publish_experimental_watchos:
+    runs-on: macos-latest
+    timeout-minutes: 20
+    needs: experimental_watchos
+    if: ${{ needs.experimental_watchos.success() }}
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Restore Gradle cache
+        id: cache
+        uses: actions/cache@v2.1.6
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            ~/.konan
+          key: experimeental-watchos-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            experimental-watchos-step-gradle-
+
+      - name: Publish watchosArm64
+        working-directory: arrow-libs
+        run: ./gradlew publishWatchosArm64PublicationToMavenRepository
+
   publish_windows:
     runs-on: windows-latest
     timeout-minutes: 20
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 0c8fea28622..f44f82433ac 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -218,7 +218,7 @@ jobs:
 
   watchos:
     runs-on: macos-latest
-    timeout-minutes: 35
+    timeout-minutes: 24
 
     steps:
       - uses: actions/checkout@v2
@@ -257,6 +257,48 @@ jobs:
           name: test-reports
           path: test-reports
 
+  experimental_watchos:
+    runs-on: macos-latest
+    timeout-minutes: 35
+    continue-on-error: true
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Restore Gradle cache
+        id: cache
+        uses: actions/cache@v2.1.6
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            ~/.konan
+          key: experimental-watchos--step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            experimental-watchos-step-gradle-
+
+      - name: Build
+        working-directory: arrow-libs
+        run: ./gradlew  watchosArm64TestBinaries watchosArm64TestKlibrary
+
+      - name: "Prepare test reports"
+        if: ${{ always() }}
+        run: |
+          mkdir test-reports
+          for report in `ls -d arrow-libs/**/**/build/reports/tests`; do
+            module=$(echo $report | cut -d/ -f3)
+            cp -r $report test-reports/$module
+          done
+
+      - name: "Make test reports available to download"
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v1
+        with:
+          name: test-reports
+          path: test-reports
+
   windows:
     runs-on: windows-latest
     timeout-minutes: 20

From 2b29f50d9c5eb2e7efb86c684dcc2683066d5aec Mon Sep 17 00:00:00 2001
From: i-walker <46971368+i-walker@users.noreply.github.com>
Date: Mon, 13 Sep 2021 21:05:00 +0200
Subject: [PATCH 11/18] fix

---
 .github/workflows/pull_request.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index f44f82433ac..80ff60ee340 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -239,7 +239,7 @@ jobs:
 
       - name: Build
         working-directory: arrow-libs
-        run: ./gradlew watchosX64Test watchosX86Test watchosSimulatorArm64Test watchosArm32TestBinaries watchosArm32TestKlibrary watchosArm64TestBinaries watchosArm64TestKlibrary
+        run: ./gradlew watchosX64Test watchosX86Test watchosSimulatorArm64Test watchosArm32TestBinaries watchosArm32TestKlibrary
 
       - name: "Prepare test reports"
         if: ${{ always() }}

From b970004dc256f5ce64f3aafc523fad22c4901c8d Mon Sep 17 00:00:00 2001
From: i-walker <46971368+i-walker@users.noreply.github.com>
Date: Mon, 13 Sep 2021 21:05:45 +0200
Subject: [PATCH 12/18] fix

---
 .github/workflows/pull_request.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 80ff60ee340..aa7c434fc6e 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -259,8 +259,9 @@ jobs:
 
   experimental_watchos:
     runs-on: macos-latest
-    timeout-minutes: 35
+    timeout-minutes: 20
     continue-on-error: true
+    needs: watchos
 
     steps:
       - uses: actions/checkout@v2

From 3bf1671ef6418fb1ba3932169d6d14be9a0c5b84 Mon Sep 17 00:00:00 2001
From: i-walker <46971368+i-walker@users.noreply.github.com>
Date: Mon, 13 Sep 2021 22:29:53 +0200
Subject: [PATCH 13/18] rm experimental workflow

---
 .github/workflows/publish.yml      | 27 -------------------
 .github/workflows/pull_request.yml | 43 ------------------------------
 2 files changed, 70 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 79b8013d756..3b8460b22fc 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -191,33 +191,6 @@ jobs:
         working-directory: arrow-libs
         run: ./gradlew publishWatchosSimulatorArm64PublicationToMavenRepository
 
-  publish_experimental_watchos:
-    runs-on: macos-latest
-    timeout-minutes: 20
-    needs: experimental_watchos
-    if: ${{ needs.experimental_watchos.success() }}
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Restore Gradle cache
-        id: cache
-        uses: actions/cache@v2.1.6
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-            ~/.konan
-          key: experimeental-watchos-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            experimental-watchos-step-gradle-
-
-      - name: Publish watchosArm64
-        working-directory: arrow-libs
-        run: ./gradlew publishWatchosArm64PublicationToMavenRepository
-
   publish_windows:
     runs-on: windows-latest
     timeout-minutes: 20
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index aa7c434fc6e..235c292ab4b 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -257,49 +257,6 @@ jobs:
           name: test-reports
           path: test-reports
 
-  experimental_watchos:
-    runs-on: macos-latest
-    timeout-minutes: 20
-    continue-on-error: true
-    needs: watchos
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Restore Gradle cache
-        id: cache
-        uses: actions/cache@v2.1.6
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-            ~/.konan
-          key: experimental-watchos--step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            experimental-watchos-step-gradle-
-
-      - name: Build
-        working-directory: arrow-libs
-        run: ./gradlew  watchosArm64TestBinaries watchosArm64TestKlibrary
-
-      - name: "Prepare test reports"
-        if: ${{ always() }}
-        run: |
-          mkdir test-reports
-          for report in `ls -d arrow-libs/**/**/build/reports/tests`; do
-            module=$(echo $report | cut -d/ -f3)
-            cp -r $report test-reports/$module
-          done
-
-      - name: "Make test reports available to download"
-        if: ${{ always() }}
-        uses: actions/upload-artifact@v1
-        with:
-          name: test-reports
-          path: test-reports
-
   windows:
     runs-on: windows-latest
     timeout-minutes: 20

From 04e940249e9423a2cc9cff44db51e86cb965dcb0 Mon Sep 17 00:00:00 2001
From: i-walker <46971368+i-walker@users.noreply.github.com>
Date: Tue, 14 Sep 2021 08:20:35 +0200
Subject: [PATCH 14/18] push

---
 .github/workflows/pull_request.yml                          | 2 +-
 .../src/iosArm64Main/kotlin/arrow/fx/coroutines/predef.kt   | 6 ------
 .../kotlin/arrow/fx/coroutines/predef.kt                    | 6 ------
 .../src/iosX64Main/kotlin/arrow/fx/coroutines/predef.kt     | 6 ------
 .../src/linuxX64Main/kotlin/arrow/fx/coroutines/predef.kt   | 6 ------
 .../src/macosArm64Main/kotlin/arrow/fx/coroutines/predef.kt | 6 ------
 .../src/macosX64Main/kotlin/arrow/fx/coroutines/predef.kt   | 6 ------
 .../src/mingwX64Main/kotlin/arrow/fx/coroutines/predef.kt   | 6 ------
 .../kotlin/arrow/fx/coroutines/predef.kt                    | 0
 .../src/tvosMain/kotlin/arrow/fx/coroutines/predef.kt       | 6 ------
 .../kotlin/arrow/fx/coroutines/predef.kt                    | 6 ------
 .../watchosArm32Main/kotlin/arrow/fx/coroutines/predef.kt   | 6 ------
 .../watchosArm64Main/kotlin/arrow/fx/coroutines/predef.kt   | 6 ------
 .../kotlin/arrow/fx/coroutines/predef.kt                    | 6 ------
 .../src/watchosX64Main/kotlin/arrow/fx/coroutines/predef.kt | 6 ------
 .../src/watchosX86Main/kotlin/arrow/fx/coroutines/predef.kt | 6 ------
 arrow-libs/gradle/subproject-mpp.gradle                     | 3 ---
 17 files changed, 1 insertion(+), 88 deletions(-)
 delete mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/iosArm64Main/kotlin/arrow/fx/coroutines/predef.kt
 delete mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/iosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt
 delete mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/iosX64Main/kotlin/arrow/fx/coroutines/predef.kt
 delete mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/linuxX64Main/kotlin/arrow/fx/coroutines/predef.kt
 delete mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/macosArm64Main/kotlin/arrow/fx/coroutines/predef.kt
 delete mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/macosX64Main/kotlin/arrow/fx/coroutines/predef.kt
 delete mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/mingwX64Main/kotlin/arrow/fx/coroutines/predef.kt
 rename arrow-libs/fx/arrow-fx-coroutines/src/{iosArm32Main => nativeMain}/kotlin/arrow/fx/coroutines/predef.kt (100%)
 delete mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/tvosMain/kotlin/arrow/fx/coroutines/predef.kt
 delete mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/tvosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt
 delete mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/watchosArm32Main/kotlin/arrow/fx/coroutines/predef.kt
 delete mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/watchosArm64Main/kotlin/arrow/fx/coroutines/predef.kt
 delete mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/watchosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt
 delete mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/watchosX64Main/kotlin/arrow/fx/coroutines/predef.kt
 delete mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/watchosX86Main/kotlin/arrow/fx/coroutines/predef.kt

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 235c292ab4b..92f025ffa06 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -177,7 +177,7 @@ jobs:
 
   tvos:
     runs-on: macos-latest
-    timeout-minutes: 40
+    timeout-minutes: 20
 
     steps:
       - uses: actions/checkout@v2
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/iosArm64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/iosArm64Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/iosArm64Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/iosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/iosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/iosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/iosX64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/iosX64Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/iosX64Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/linuxX64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/linuxX64Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/linuxX64Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/macosArm64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/macosArm64Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/macosArm64Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/macosX64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/macosX64Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/macosX64Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/mingwX64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/mingwX64Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/mingwX64Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/iosArm32Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/nativeMain/kotlin/arrow/fx/coroutines/predef.kt
similarity index 100%
rename from arrow-libs/fx/arrow-fx-coroutines/src/iosArm32Main/kotlin/arrow/fx/coroutines/predef.kt
rename to arrow-libs/fx/arrow-fx-coroutines/src/nativeMain/kotlin/arrow/fx/coroutines/predef.kt
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/tvosMain/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/tvosMain/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/tvosMain/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/tvosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/tvosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/tvosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/watchosArm32Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/watchosArm32Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/watchosArm32Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/watchosArm64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/watchosArm64Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/watchosArm64Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/watchosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/watchosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/watchosSimulatorArm64Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/watchosX64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/watchosX64Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/watchosX64Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/watchosX86Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/watchosX86Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/watchosX86Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/gradle/subproject-mpp.gradle b/arrow-libs/gradle/subproject-mpp.gradle
index 18259fbd5a2..d3caedbc338 100644
--- a/arrow-libs/gradle/subproject-mpp.gradle
+++ b/arrow-libs/gradle/subproject-mpp.gradle
@@ -36,7 +36,6 @@ kotlin {
     tvosSimulatorArm64()
 
     watchosArm32()
-    watchosArm64()
     watchosX86()
     watchosX64()
     watchosSimulatorArm64()
@@ -87,7 +86,6 @@ kotlin {
             iosSimulatorArm64Main.dependsOn(it)
             watchosX86Main.dependsOn(it)
             watchosArm32Main.dependsOn(it)
-            watchosArm64Main.dependsOn(it)
             watchosX64Main.dependsOn(it)
             watchosSimulatorArm64Main.dependsOn(it)
             tvosMain.dependsOn(it)
@@ -105,7 +103,6 @@ kotlin {
             iosSimulatorArm64Test.dependsOn(it)
             watchosX86Test.dependsOn(it)
             watchosArm32Test.dependsOn(it)
-            watchosArm64Test.dependsOn(it)
             watchosX64Test.dependsOn(it)
             watchosSimulatorArm64Test.dependsOn(it)
             tvosTest.dependsOn(it)

From b9319f633293b4989b3ad891749fdd0018cec5fb Mon Sep 17 00:00:00 2001
From: i-walker <46971368+i-walker@users.noreply.github.com>
Date: Tue, 14 Sep 2021 08:37:41 +0200
Subject: [PATCH 15/18] rm jvm and platform specific settings in publishing
 arrow-stack

---
 .github/scripts/set-env.sh    | 4 ++--
 .github/scripts/show-env.sh   | 2 +-
 .github/workflows/publish.yml | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/scripts/set-env.sh b/.github/scripts/set-env.sh
index 5ef6ba3354f..8bc8a08c964 100755
--- a/.github/scripts/set-env.sh
+++ b/.github/scripts/set-env.sh
@@ -2,8 +2,8 @@
  
 set -ex
 
-echo "$JAVA_HOME_8_X64/bin" >> $GITHUB_PATH
-echo "JAVA_HOME=$JAVA_HOME_8_X64" >> $GITHUB_ENV
+# echo "$JAVA_HOME_8_X64/bin" >> $GITHUB_PATH
+# echo "JAVA_HOME=$JAVA_HOME_8_X64" >> $GITHUB_ENV
 
 NEW_RELEASE_VERSION_EXISTS=0
 if [ "$GITHUB_REF" == "refs/heads/main" ]; then
diff --git a/.github/scripts/show-env.sh b/.github/scripts/show-env.sh
index a998134aaf9..3c98521eed4 100755
--- a/.github/scripts/show-env.sh
+++ b/.github/scripts/show-env.sh
@@ -2,7 +2,7 @@
  
 set -e
 
-grep VERSION_NAME $BASEDIR/gradle.properties
+# grep VERSION_NAME $BASEDIR/gradle.properties
 echo "LATEST_PUBLISHED_VERSION: $LATEST_PUBLISHED_VERSION"
 echo "RELEASE_VERSION: $RELEASE_VERSION"
 echo "NEW_RELEASE_VERSION_EXISTS: $NEW_RELEASE_VERSION_EXISTS"
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 3b8460b22fc..4cbf7e692ab 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -228,9 +228,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: "Setup"
-        run: brew install grep
-
       - name: "Set env"
         run: ${GITHUB_WORKSPACE}/.github/scripts/set-env.sh
 

From 57548c7d6342be86c7a14cc04256cb5206833989 Mon Sep 17 00:00:00 2001
From: i-walker <46971368+i-walker@users.noreply.github.com>
Date: Tue, 14 Sep 2021 13:48:39 +0200
Subject: [PATCH 16/18] merge linux platform tests

---
 .github/workflows/pull_request.yml | 47 ++----------------------------
 1 file changed, 3 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 92f025ffa06..75653b2ec97 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -52,50 +52,9 @@ jobs:
         working-directory: arrow-site
         run: ./gradlew runAnk
 
-  js:
+  linux_jvm_and_js:
     runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Restore Gradle cache
-        id: cache
-        uses: actions/cache@v2.1.6
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-            ~/.gradle/yarn
-            ~/.gradle/nodejs
-          key: js-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            js-step-gradle-
-
-      - name: Build
-        working-directory: arrow-libs
-        run: ./gradlew jsTest
-
-      - name: "Prepare test reports"
-        if: ${{ always() }}
-        run: |
-          mkdir test-reports
-          for report in `ls -d arrow-libs/**/**/build/reports/tests`; do
-            module=$(echo $report | cut -d/ -f3)
-            cp -r $report test-reports/$module
-          done
-
-      - name: "Make test reports available to download"
-        if: ${{ always() }}
-        uses: actions/upload-artifact@v1
-        with:
-          name: test-reports
-          path: test-reports
-  linux_and_jvm:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 25
 
     steps:
       - uses: actions/checkout@v2
@@ -116,7 +75,7 @@ jobs:
 
       - name: Build
         working-directory: arrow-libs
-        run: ./gradlew linuxX64Test jvmTest
+        run: ./gradlew linuxX64Test jvmTest jsTest
 
       - name: "Prepare test reports"
         if: ${{ always() }}

From 6799a02bc84f4f580a8c33704b2a95f040472261 Mon Sep 17 00:00:00 2001
From: i-walker <46971368+i-walker@users.noreply.github.com>
Date: Tue, 14 Sep 2021 13:54:18 +0200
Subject: [PATCH 17/18] merge

---
 .github/workflows/publish.yml      | 65 ++++++------------------------
 .github/workflows/pull_request.yml | 49 ++--------------------
 2 files changed, 16 insertions(+), 98 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 4cbf7e692ab..445be74ef70 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -19,7 +19,7 @@ env:
   GRADLE_OPTS: -Dorg.gradle.configureondemand=true -Dorg.gradle.parallel=false -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
 
 jobs:
-  publish_js_commons:
+  publish_linux_jvm_js_and_commons:
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -35,38 +35,14 @@ jobs:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-            ~/.gradle/yarn
-            ~/.gradle/nodejs
-          key: js-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+            ~/.konan
+          key: linux-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            js-step-gradle-
+            linux-step-gradle-
 
       - name: Publish commons
         working-directory: arrow-libs
         run: ./gradlew publishKotlinMultiplatformPublicationToMavenRepository
-      - name: Publish js
-        working-directory: arrow-libs
-        run: ./gradlew publishJsPublicationToMavenRepository
-  publish_linux_and_jvm:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Restore Gradle cache
-        id: cache
-        uses: actions/cache@v2.1.6
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-            ~/.konan
-          key: linux-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            linux-step-gradle-
 
       - name: Publish LinuxX64
         working-directory: arrow-libs
@@ -76,6 +52,10 @@ jobs:
         working-directory: arrow-libs
         run: ./gradlew publishJvmPublicationToMavenRepository
 
+      - name: Publish Js
+        working-directory: arrow-libs
+        run: ./gradlew publishJsPublicationToMavenRepository
+
   publish_macos_and_ios:
     runs-on: macos-latest
     timeout-minutes: 20
@@ -121,9 +101,9 @@ jobs:
         working-directory: arrow-libs
         run: ./gradlew publishIosSimulatorArm64PublicationToMavenRepository
 
-  publish_tvos:
+  publish_tvos_and_watchos:
     runs-on: macos-latest
-    timeout-minutes: 20
+    timeout-minutes: 30
 
     steps:
       - uses: actions/checkout@v2
@@ -138,9 +118,9 @@ jobs:
             ~/.gradle/caches
             ~/.gradle/wrapper
             ~/.konan
-          key: tv-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          key: tv-watchos-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            tv-step-gradle-
+            tv-watchos-step-gradle-
 
       - name: Publish tvos Arm64
         working-directory: arrow-libs
@@ -154,27 +134,6 @@ jobs:
         working-directory: arrow-libs
         run: ./gradlew publishTvosSimulatorArm64PublicationToMavenRepository
 
-  publish_watchos:
-    runs-on: macos-latest
-    timeout-minutes: 20
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Restore Gradle cache
-        id: cache
-        uses: actions/cache@v2.1.6
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-            ~/.konan
-          key: watchos-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            watchos-step-gradle-
-
       - name: Publish watchosX64
         working-directory: arrow-libs
         run: ./gradlew publishWatchosX64PublicationToMavenRepository
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 75653b2ec97..3bc0b7c0ec6 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -134,50 +134,9 @@ jobs:
           name: test-reports
           path: test-reports
 
-  tvos:
-    runs-on: macos-latest
-    timeout-minutes: 20
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Restore Gradle cache
-        id: cache
-        uses: actions/cache@v2.1.6
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-            ~/.konan
-          key: tv-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            tv-step-gradle-
-
-      - name: Build
-        working-directory: arrow-libs
-        run: ./gradlew tvosX64Test tvosSimulatorArm64Test tvosArm64TestBinaries tvosArm64TestKlibrary
-
-      - name: "Prepare test reports"
-        if: ${{ always() }}
-        run: |
-          mkdir test-reports
-          for report in `ls -d arrow-libs/**/**/build/reports/tests`; do
-            module=$(echo $report | cut -d/ -f3)
-            cp -r $report test-reports/$module
-          done
-
-      - name: "Make test reports available to download"
-        if: ${{ always() }}
-        uses: actions/upload-artifact@v1
-        with:
-          name: test-reports
-          path: test-reports
-
   watchos:
     runs-on: macos-latest
-    timeout-minutes: 24
+    timeout-minutes: 30
 
     steps:
       - uses: actions/checkout@v2
@@ -192,13 +151,13 @@ jobs:
             ~/.gradle/caches
             ~/.gradle/wrapper
             ~/.konan
-          key: watchos-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          key: tv-watchos-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            watchos-step-gradle-
+            tv-watch-os-step-gradle-
 
       - name: Build
         working-directory: arrow-libs
-        run: ./gradlew watchosX64Test watchosX86Test watchosSimulatorArm64Test watchosArm32TestBinaries watchosArm32TestKlibrary
+        run: ./gradlew watchosX64Test watchosX86Test watchosSimulatorArm64Test watchosArm32TestBinaries watchosArm32TestKlibrary tvosX64Test tvosSimulatorArm64Test tvosArm64TestBinaries tvosArm64TestKlibrary
 
       - name: "Prepare test reports"
         if: ${{ always() }}

From 899c8d90fd2a8a4dbed859283f316a9177e115e2 Mon Sep 17 00:00:00 2001
From: i-walker <46971368+i-walker@users.noreply.github.com>
Date: Tue, 14 Sep 2021 14:10:15 +0200
Subject: [PATCH 18/18] merge

---
 .github/workflows/pull_request.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 3bc0b7c0ec6..f6780af9dd3 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -134,7 +134,7 @@ jobs:
           name: test-reports
           path: test-reports
 
-  watchos:
+  tv_and_watchos:
     runs-on: macos-latest
     timeout-minutes: 30