Skip to content

Commit

Permalink
chore(dependencies): Autobump korkVersion (#6150)
Browse files Browse the repository at this point in the history
* chore(dependencies): Autobump korkVersion

* fix(build): give gradle more memory

to avoid errors like

> Task :clouddriver-ecs:integrationTest
Exception: java.lang.OutOfMemoryError thrown from the UncaughtExceptionHandler in thread "http-nio-auto-1-Poller"
Exception: java.lang.OutOfMemoryError thrown from the UncaughtExceptionHandler in thread "http-nio-auto-2-Poller"
Exception: java.lang.OutOfMemoryError thrown from the UncaughtExceptionHandler in thread "Catalina-utility-2"
Exception: java.lang.OutOfMemoryError thrown from the UncaughtExceptionHandler in thread "default housekeeper"

from https://github.com/spinnaker/clouddriver/actions/runs/7779413893/job/21235267313

* fix(build): 8g isn't enough, try 10

from https://github.com/spinnaker/clouddriver/actions/runs/7789297908/job/21240573237?pr=6150:

> Task :clouddriver-ecs:integrationTest
Exception: java.lang.OutOfMemoryError thrown from the UncaughtExceptionHandler in thread "Keep-Alive-Timer"

---------

Co-authored-by: root <root@77d647e9c01e>
Co-authored-by: David Byron <dbyron@salesforce.com>
  • Loading branch information
3 people authored Feb 5, 2024
1 parent 14abd69 commit f8cd211
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- release-*

env:
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx6g -Xms6g
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx10g -Xms10g
CONTAINER_REGISTRY: us-docker.pkg.dev/spinnaker-community/docker

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests-kubernetes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Kubernetes Integration Tests
on: workflow_call

env:
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx6g -Xms6g
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx10g -Xms10g

jobs:
it-test-kubernetes:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request:

env:
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx6g -Xms6g
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx10g -Xms10g

jobs:
it-test-kubernetes:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: PR Build
on: [ pull_request ]

env:
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx6g -Xms6g
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx10g -Xms10g
CONTAINER_REGISTRY: us-docker.pkg.dev/spinnaker-community/docker

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- "v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+"

env:
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx6g -Xms6g
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx10g -Xms10g
CONTAINER_REGISTRY: us-docker.pkg.dev/spinnaker-community/docker

jobs:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.compile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ RUN apt-get update && apt-get install -y \
&& rm -rf /var/lib/apt/lists/*
LABEL maintainer="sig-platform@spinnaker.io"
ENV GRADLE_USER_HOME /workspace/.gradle
ENV GRADLE_OPTS "-Xmx4g -Xms2g"
ENV GRADLE_OPTS "-Xmx10g -Xms10g"
CMD ./gradlew --no-daemon clouddriver-web:installDist -x test
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
fiatVersion=1.43.0
korkVersion=7.210.0
korkVersion=7.211.0
org.gradle.parallel=true
spinnakerGradleVersion=8.32.1
targetJava11=true
Expand All @@ -20,4 +20,4 @@ kotlinVersion=1.5.32
#fiatComposite=true
#korkComposite=true

org.gradle.jvmargs=-Xmx6g -Xms6g
org.gradle.jvmargs=-Xmx10g -Xms10g

0 comments on commit f8cd211

Please sign in to comment.