Skip to content

Commit

Permalink
Fix Gradle an existing connection was forcibly closed by the remote h…
Browse files Browse the repository at this point in the history
…ost (#2610)

* Only test windows on windows
* Add stacktrace, and scan to get more details on build
* file.encoding in JVM_OPTS
* Remove configureondemand
  • Loading branch information
nomisRev authored Dec 26, 2021
1 parent 07306d4 commit 3b391d3
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 31 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/generate-alpha-tag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ on:
- main

env:
JAVA_OPTS: -Xms2g -Xmx4g
GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.configureondemand=true -Dorg.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx5g -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"

jobs:
build:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/generate-tag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ on:
- 'auto'

env:
JAVA_OPTS: -Xms2g -Xmx4g
GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.configureondemand=true -Dorg.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx5g -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"

jobs:
build:
Expand Down
20 changes: 16 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ on:

env:
BASEDIR: ${{github.workspace}}/arrow-libs
JAVA_OPTS: -Xms2g -Xmx4g
GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.configureondemand=true -Dorg.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx5g -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
SONATYPE_PWD: ${{ secrets.SONATYPE_PWD }}
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.ORG_GRADLE_PROJECT_signingKey }}
Expand Down Expand Up @@ -46,8 +45,21 @@ jobs:
distribution: 'zulu'
java-version: 11

- name: Build
run: ./gradlew build
- name: appleTest
uses: gradle/gradle-build-action@v2.0.1
if: matrix.os == 'macos-latest'
with:
arguments: --full-stacktrace --scan appleTest

- name: Ubuntu build
uses: gradle/gradle-build-action@v2.0.1
if: matrix.os == 'ubuntu-latest'
with:
arguments: --full-stacktrace --scan build

- name: mingwX64Test
uses: gradle/gradle-build-action@v2.0.1
if: matrix.os == 'windows-latest'

- id: get-arrow-version
name: Get Arrow version
Expand Down
41 changes: 20 additions & 21 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: "pull_request"
on: pull_request

env:
JAVA_OPTS: -Xms2g -Xmx4g
GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.configureondemand=true -Dorg.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx5g -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"

jobs:
build:
Expand All @@ -26,13 +25,25 @@ jobs:
distribution: 'zulu'
java-version: 11

- name: Build
- name: appleTest
uses: gradle/gradle-build-action@v2.0.1
if: matrix.os == 'macos-latest'
with:
arguments: --full-stacktrace --scan appleTest

- name: Ubuntu build
uses: gradle/gradle-build-action@v2.0.1
if: matrix.os == 'ubuntu-latest'
with:
arguments: --full-stacktrace --scan build

- name: mingwX64Test
uses: gradle/gradle-build-action@v2.0.1
if: matrix.os == 'windows-latest'
with:
arguments: build
arguments: --full-stacktrace --scan mingwX64Test

- name: Upload reports
if: failure()
uses: actions/upload-artifact@v2.2.4
with:
name: 'reports-${{ matrix.os }}'
Expand All @@ -50,28 +61,16 @@ jobs:
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
~/.konan
key: misc-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
misc-step-gradle-
- name: Set up Java
uses: actions/setup-java@v2.4.0
with:
distribution: 'zulu'
java-version: 11

- name: "Dump new API files"
run: ./gradlew apiDump
- name: Build
uses: gradle/gradle-build-action@v2.0.1
with:
arguments: apiDump

- name: Stop Gradle daemons
run: ./gradlew --stop
Expand Down
18 changes: 18 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,21 @@ tasks {
apiValidation {
ignoredProjects.addAll(listOf("arrow-optics-ksp-plugin", "arrow-optics-test", "arrow-site"))
}


val appleTest = tasks.create("appleTest")

subprojects {
afterEvaluate {
val appleTargets = setOf("tvos", "watchos", "ios", "macos")

extensions.findByType<org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension>()
?.sourceSets
?.filter { appleTargets.any { target -> it.name.contains(target) } && it.name.contains("Test") }
?.forEach {
tasks.findByName(it.name)?.let { task ->
appleTest.dependsOn(task)
}
}
}
}
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ dokka = "1.5.30"
jUnit = "4.12"
jUnitJupiter = "5.8.2"
jUnitVintage = "5.5.2"
kotest = "5.0.2"
kotestGradle = "5.0.2"
kotest = "5.0.3"
kotestGradle = "5.0.3"
kotlin = "1.6.10"
kotlinBinaryCompatibilityValidator = "0.7.1"
kotlinCompileTesting = "1.4.7"
Expand Down
11 changes: 11 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ pluginManagement {
}
}

plugins {
id("com.gradle.enterprise") version "3.8"
}

dependencyResolutionManagement {
repositories {
mavenCentral()
Expand Down Expand Up @@ -62,3 +66,10 @@ project(":arrow-stack").projectDir = file("arrow-libs/stack")
// SITE
include("arrow-site")
project(":arrow-site").projectDir = file("arrow-site")

gradleEnterprise {
buildScan {
termsOfServiceUrl = "https://gradle.com/terms-of-service"
termsOfServiceAgree = "yes"
}
}

0 comments on commit 3b391d3

Please sign in to comment.