Port changes from release 1.0.0 (#2516)

arrow-kt · Sep 18, 2021 · 4c809af · 4c809af
1 parent f637c54
commit 4c809af
Show file tree

Hide file tree

Showing 2 changed files with 137 additions and 140 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -3,11 +3,7 @@ name: "Publish all libs, Arrow-stack and Docs"
 on:
   push:
     branches:
-      - main
-      - release/**
-    paths:
-      - 'arrow-libs/**'
-      - '.github/**'
+      - release/0.13.3
 
 env:
   BASEDIR: ${{github.workspace}}/arrow-libs
@@ -19,7 +15,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_linux_jvm_js_and_commons:
+  publish_linux:
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -49,31 +45,31 @@ jobs:
       - name: "Show env"
         run: ${GITHUB_WORKSPACE}/.github/scripts/show-env.sh
 
-      - name: Publish commons
+      - name: Publish Arrow Libs
         working-directory: arrow-libs
         run: |
-          ./gradlew publishKotlinMultiplatformPublicationToMavenRepository
-          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) Commons deployed!"
-
-      - name: Publish LinuxX64
-        working-directory: arrow-libs
-        run: |
-          ./gradlew publishLinuxX64PublicationToMavenRepository
-          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) LinuxX64 deployed!"
-
-      - name: Publish Jvm
-        working-directory: arrow-libs
-        run: |
-          ./gradlew publishJvmPublicationToMavenRepository
-          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) JVM deployed!"
-
-      - name: Publish Js
-        working-directory: arrow-libs
-        run: |
-          ./gradlew publishJsPublicationToMavenRepository
-          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) JS deployed!"
-
-  publish_macos_and_ios:
+          ./gradlew publish
+          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) Arrow libs deployed!"
+
+#      - name: Publish LinuxX64
+#        working-directory: arrow-libs
+#        run: |
+#          ./gradlew publishLinuxX64PublicationToMavenRepository
+#          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) LinuxX64 deployed!"
+#
+#      - name: Publish Jvm
+#        working-directory: arrow-libs
+#        run: |
+#          ./gradlew publishJvmPublicationToMavenRepository
+#          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) JVM deployed!"
+#
+#      - name: Publish Js
+#        working-directory: arrow-libs
+#        run: |
+#          ./gradlew publishJsPublicationToMavenRepository
+#          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) JS deployed!"
+
+  publish_macos:
     runs-on: macos-latest
     timeout-minutes: 40
 
@@ -103,113 +99,113 @@ jobs:
       - name: "Show env"
         run: ${GITHUB_WORKSPACE}/.github/scripts/show-env.sh
 
-      - name: Publish macos X64
-        working-directory: arrow-libs
-        run: |
-          ./gradlew publishMacosX64PublicationToMavenRepository
-          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) MacOs X64 deployed!"
-
-      - name: Publish macos Arm64
-        working-directory: arrow-libs
-        run: |
-          ./gradlew publishMacosArm64PublicationToMavenRepository
-          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) MacOs Arm64 deployed!"
-
-      - name: Publish iosX64
-        working-directory: arrow-libs
-        run: |
-          ./gradlew publishIosX64PublicationToMavenRepository
-          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) ios X64 deployed!"
-
-      - name: Publish iosArm64
-        working-directory: arrow-libs
-        run: |
-          ./gradlew publishIosArm64PublicationToMavenRepository
-          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) ios Arm64 deployed!"
-
-      - name: Publish iosArm32
-        working-directory: arrow-libs
-        run: |
-          ./gradlew publishIosArm32PublicationToMavenRepository
-          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) ios Arm32 deployed!"
-
-      - name: Publish iosSimulatorArm64
-        working-directory: arrow-libs
-        run: |
-          ./gradlew publishIosSimulatorArm64PublicationToMavenRepository
-          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) iosSimulatorArm64 deployed!"
-
-  publish_tvos_and_watchos:
-    runs-on: macos-latest
-    timeout-minutes: 40
-
-    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-watchos-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            tv-watchos-step-gradle-
-
-      - name: "Install grep"
-        run: brew install grep
-
-      - name: "Set env"
-        run: ${GITHUB_WORKSPACE}/.github/scripts/set-env.sh
-
-      - name: "Show env"
-        run: ${GITHUB_WORKSPACE}/.github/scripts/show-env.sh
-
-      - name: Publish tvos Arm64
-        working-directory: arrow-libs
-        run: |
-          ./gradlew publishTvosArm64PublicationToMavenRepository
-          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) tvosArm64 deployed!"
-
-      - name: Publish tvos X64
-        working-directory: arrow-libs
-        run: |
-          ./gradlew publishTvosX64PublicationToMavenRepository
-          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) tvosX64 deployed!"
-
-      - name: Publish tvosSimulatorArm64
+      - name: Publish macos
         working-directory: arrow-libs
         run: |
-          ./gradlew publishTvosSimulatorArm64PublicationToMavenRepository
-          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) tvosSimulatorArm64 deployed!"
-
-      - name: Publish watchosX64
-        working-directory: arrow-libs
-        run: |
-          ./gradlew publishWatchosX64PublicationToMavenRepository
-          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) watchosX64 deployed!"
-
-      - name: Publish watchosX86
-        working-directory: arrow-libs
-        run: |
-          ./gradlew publishWatchosX86PublicationToMavenRepository
-          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) watchosX86 deployed!"
-
-      - name: Publish watchosArm32
-        working-directory: arrow-libs
-        run: |
-          ./gradlew publishWatchosArm32PublicationToMavenRepository
-          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) watchosArm32 deployed!"
-
-      - name: Publish watchosSimulatorArm64
-        working-directory: arrow-libs
-        run: |
-          ./gradlew publishWatchosSimulatorArm64PublicationToMavenRepository
-          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) watchosSimulatorArm64 deployed!"
+          ./gradlew publish
+          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) MacOs deployed!"
+
+#      - name: Publish macos Arm64
+#        working-directory: arrow-libs
+#        run: |
+#          ./gradlew publishMacosArm64PublicationToMavenRepository
+#          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) MacOs Arm64 deployed!"
+#
+#      - name: Publish iosX64
+#        working-directory: arrow-libs
+#        run: |
+#          ./gradlew publishIosX64PublicationToMavenRepository
+#          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) ios X64 deployed!"
+#
+#      - name: Publish iosArm64
+#        working-directory: arrow-libs
+#        run: |
+#          ./gradlew publishIosArm64PublicationToMavenRepository
+#          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) ios Arm64 deployed!"
+#
+#      - name: Publish iosArm32
+#        working-directory: arrow-libs
+#        run: |
+#          ./gradlew publishIosArm32PublicationToMavenRepository
+#          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) ios Arm32 deployed!"
+#
+#      - name: Publish iosSimulatorArm64
+#        working-directory: arrow-libs
+#        run: |
+#          ./gradlew publishIosSimulatorArm64PublicationToMavenRepository
+#          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) iosSimulatorArm64 deployed!"
+
+#  publish_tvos_and_watchos:
+#    runs-on: macos-latest
+#    timeout-minutes: 40
+#
+#    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-watchos-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+#          restore-keys: |
+#            tv-watchos-step-gradle-
+#
+#      - name: "Install grep"
+#        run: brew install grep
+#
+#      - name: "Set env"
+#        run: ${GITHUB_WORKSPACE}/.github/scripts/set-env.sh
+#
+#      - name: "Show env"
+#        run: ${GITHUB_WORKSPACE}/.github/scripts/show-env.sh
+#
+#      - name: Publish tvos Arm64
+#        working-directory: arrow-libs
+#        run: |
+#          ./gradlew publishTvosArm64PublicationToMavenRepository
+#          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) tvosArm64 deployed!"
+#
+#      - name: Publish tvos X64
+#        working-directory: arrow-libs
+#        run: |
+#          ./gradlew publishTvosX64PublicationToMavenRepository
+#          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) tvosX64 deployed!"
+#
+#      - name: Publish tvosSimulatorArm64
+#        working-directory: arrow-libs
+#        run: |
+#          ./gradlew publishTvosSimulatorArm64PublicationToMavenRepository
+#          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) tvosSimulatorArm64 deployed!"
+#
+#      - name: Publish watchosX64
+#        working-directory: arrow-libs
+#        run: |
+#          ./gradlew publishWatchosX64PublicationToMavenRepository
+#          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) watchosX64 deployed!"
+#
+#      - name: Publish watchosX86
+#        working-directory: arrow-libs
+#        run: |
+#          ./gradlew publishWatchosX86PublicationToMavenRepository
+#          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) watchosX86 deployed!"
+#
+#      - name: Publish watchosArm32
+#        working-directory: arrow-libs
+#        run: |
+#          ./gradlew publishWatchosArm32PublicationToMavenRepository
+#          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) watchosArm32 deployed!"
+#
+#      - name: Publish watchosSimulatorArm64
+#        working-directory: arrow-libs
+#        run: |
+#          ./gradlew publishWatchosSimulatorArm64PublicationToMavenRepository
+#          echo "$(cat $BASEDIR/gradle.properties | grep VERSION_NAME | cut -d'=' -f2) watchosSimulatorArm64 deployed!"
 
   publish_windows:
     runs-on: windows-latest
@@ -240,10 +236,10 @@ jobs:
         run: ${GITHUB_WORKSPACE}/.github/scripts/show-env.sh
         shell: bash
 
-      - name: Publish MingwX64
+      - name: Publish Windows
         working-directory: arrow-libs
         run: |
-          ./gradlew publishMingwX64PublicationToMavenRepository
+          ./gradlew publish
           echo "$(cat gradle.properties | grep VERSION_NAME | cut -d'=' -f2) MingwX64 deployed!"
 
   publish-arrow-stack:
@@ -275,7 +271,8 @@ jobs:
 
   publish_doc:
     env:
-      JAVA_OPTS: -Xms512m -Xmx1024m
+      JAVA_OPTS: -Xms2g -Xmx4g
+      GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.configureondemand=true -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Dorg.gradle.parallel=false"
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       S3_BUCKET: ${{ secrets.S3_BUCKET }}
@@ -316,7 +313,7 @@ jobs:
 
       - name: "Create API doc"
         working-directory: arrow-libs
-        run: ./gradlew dokkaJekyll
+        run: ./gradlew  --no-parallel dokkaGfm
 
       - name: "Validate documentation"
         working-directory: arrow-site

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -10,7 +10,7 @@ env:
 jobs:
   ktlint_dokka_ank:
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 60
 
     steps:
       - uses: actions/checkout@v2
@@ -46,7 +46,7 @@ jobs:
 
       - name: "Create API doc"
         working-directory: arrow-libs
-        run: ./gradlew dokkaJekyll
+        run: ./gradlew dokkaGfm
 
       - name: "Validate documentation"
         working-directory: arrow-site