From 3420cb76b2553abbdfaa3ffe48bb1cbd3c027f46 Mon Sep 17 00:00:00 2001 From: Tyluur Date: Wed, 28 May 2025 21:22:53 -0400 Subject: [PATCH 1/5] Update test-with-coverage.yml --- .github/workflows/test-with-coverage.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-with-coverage.yml b/.github/workflows/test-with-coverage.yml index fd225ad30d..b233308455 100644 --- a/.github/workflows/test-with-coverage.yml +++ b/.github/workflows/test-with-coverage.yml @@ -8,6 +8,8 @@ on: branches: [ 'main' ] env: CACHE_VERSION: 1.3.1 + GRADLE_OPTS: -Xmx5g -Xms1g -XX:MaxMetaspaceSize=1g + ORG_GRADLE_PROJECT_kotlinDaemonJvmArgs: -Xmx5g -Xms1g -XX:MaxMetaspaceSize=1g jobs: test: name: Test @@ -86,4 +88,4 @@ jobs: uses: codecov/codecov-action@v4.1.0 with: token: ${{ secrets.CODECOV_TOKEN }} - slug: GregHib/void \ No newline at end of file + slug: GregHib/void From e4d065ce58ba5f45deae856c1dc847b599724149 Mon Sep 17 00:00:00 2001 From: Tyluur Date: Wed, 28 May 2025 21:36:08 -0400 Subject: [PATCH 2/5] Update test-with-coverage.yml --- .github/workflows/test-with-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-with-coverage.yml b/.github/workflows/test-with-coverage.yml index b233308455..448909aa23 100644 --- a/.github/workflows/test-with-coverage.yml +++ b/.github/workflows/test-with-coverage.yml @@ -88,4 +88,4 @@ jobs: uses: codecov/codecov-action@v4.1.0 with: token: ${{ secrets.CODECOV_TOKEN }} - slug: GregHib/void + slug: 2011Scape/game-server From ec19c9b70dad44a1ce3358f61a8647338b562ea0 Mon Sep 17 00:00:00 2001 From: Tyluur Date: Wed, 28 May 2025 21:51:29 -0400 Subject: [PATCH 3/5] Update test-with-coverage.yml --- .github/workflows/test-with-coverage.yml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-with-coverage.yml b/.github/workflows/test-with-coverage.yml index 448909aa23..d0fc256737 100644 --- a/.github/workflows/test-with-coverage.yml +++ b/.github/workflows/test-with-coverage.yml @@ -1,4 +1,5 @@ name: Run Tests + on: push: branches: @@ -6,15 +7,18 @@ on: - 'release/**' pull_request: branches: [ 'main' ] + env: CACHE_VERSION: 1.3.1 - GRADLE_OPTS: -Xmx5g -Xms1g -XX:MaxMetaspaceSize=1g - ORG_GRADLE_PROJECT_kotlinDaemonJvmArgs: -Xmx5g -Xms1g -XX:MaxMetaspaceSize=1g + GRADLE_OPTS: -Xmx3g -Xms1g -XX:MaxMetaspaceSize=1g + ORG_GRADLE_PROJECT_kotlinDaemonJvmArgs: -Xmx2g -Xms512m -XX:MaxMetaspaceSize=512m + jobs: test: name: Test runs-on: ubuntu-latest timeout-minutes: 15 + steps: - name: Checkout repository code uses: actions/checkout@v4 @@ -32,7 +36,7 @@ jobs: - name: Validate Gradle wrapper uses: gradle/actions/wrapper-validation@v4 - - name: Check if secrets exists + - name: Check if secrets exist id: check_secret run: | if [ -n "${{ secrets.AWS_ACCESS_KEY_ID }}" ]; then @@ -54,11 +58,11 @@ jobs: key: cache-${{ env.cache_version }}-${{ hashFiles('data/cache/main_file_cache.idx255') }} path: data/cache/ enableCrossOsArchive: 'true' - restore-keys: + restore-keys: | cache-${{ env.cache_version }} cache- - - name: Download game cache files (on main branch only) + - name: Download game cache files (on main branch only) if: steps.check_secret.outputs.exists == 'true' && steps.cache-files.outputs.cache-hit != 'true' env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -75,13 +79,16 @@ jobs: echo "cache_exists=false" >> $GITHUB_OUTPUT fi + - name: Clean build artifacts + run: ./gradlew clean + - name: Run all tests if: steps.check-cache-files.outputs.cache_exists == 'true' - run: ./gradlew test + run: ./gradlew test --no-build-cache - - name: Run unit tests + - name: Run unit tests (fallback if no cache) if: steps.check-cache-files.outputs.cache_exists != 'true' - run: ./gradlew test -x :game:test + run: ./gradlew test -x :game:test --no-build-cache - name: Upload coverage report to Codecov if: steps.check_secret.outputs.exists == 'true' From 764b72a475354c9b1f02c0e6d5573a4642dec76c Mon Sep 17 00:00:00 2001 From: Tyluur Date: Wed, 28 May 2025 23:30:31 -0400 Subject: [PATCH 4/5] Update test-with-coverage.yml --- .github/workflows/test-with-coverage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-with-coverage.yml b/.github/workflows/test-with-coverage.yml index d0fc256737..cea2072a43 100644 --- a/.github/workflows/test-with-coverage.yml +++ b/.github/workflows/test-with-coverage.yml @@ -10,8 +10,8 @@ on: env: CACHE_VERSION: 1.3.1 - GRADLE_OPTS: -Xmx3g -Xms1g -XX:MaxMetaspaceSize=1g - ORG_GRADLE_PROJECT_kotlinDaemonJvmArgs: -Xmx2g -Xms512m -XX:MaxMetaspaceSize=512m + GRADLE_OPTS: -Xmx5g -Xms2g -XX:MaxMetaspaceSize=1g + ORG_GRADLE_PROJECT_kotlinDaemonJvmArgs: -Xmx4g -Xms1g -XX:MaxMetaspaceSize=1g jobs: test: From 065b4807decb2fda4eedef9328478020f807e5e3 Mon Sep 17 00:00:00 2001 From: Tyluur Date: Wed, 28 May 2025 23:31:34 -0400 Subject: [PATCH 5/5] Update gradle.properties --- gradle.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index abcd12cdef..3fb06d140f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,5 @@ #org.gradle.java.home=C:/Users//.jdks/openjdk-19.0.1/ +kotlin.daemon.jvmargs=-Xmx4g -Xms1g -XX:MaxMetaspaceSize=1g junitVersion = 5.10.2 ktorVersion = 2.3.8 displeeCacheVersion = 7.1.7 @@ -19,4 +20,4 @@ postgresqlVersion=42.7.3 hikariVersion=5.1.0 testcontainersVersion=1.20.4 postgresVersion=16.2.0 -embeddedPostgresVersion=2.1.0 \ No newline at end of file +embeddedPostgresVersion=2.1.0