Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: tidy-up memory settings and GHA workflow #4994

Merged
merged 19 commits into from
Feb 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ jobs:
node-version-file: '.nvmrc'

- name: Set up JDK 21
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: adopt
distribution: temurin
java-version: 21

- name: Install node dependencies (oeq-rest-api)
Expand Down Expand Up @@ -223,9 +223,9 @@ jobs:
libimage-exiftool-perl

- name: Set up JDK 21
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: adopt
distribution: temurin
java-version: 21

- uses: actions/checkout@v4
Expand All @@ -252,15 +252,14 @@ jobs:

- name: Setup for tests
run: |
./sbt -jvm-opts autotest/.jvmopts "project autotest" \
./sbt "project autotest" \
installEquella startEquella configureInstall setupForTests

- name: Run Scalacheck tests
# We only need to run these once, so we focus on the New UI
if: matrix.newui
run: |
./sbt -jvm-opts autotest/.jvmopts "project autotest" \
Tests/test Tests/Serial/test dumpCoverage
./sbt "project autotest" Tests/test Tests/Serial/test dumpCoverage

- name: Save Scalacheck results
if: matrix.newui && failure()
Expand All @@ -271,8 +270,7 @@ jobs:

- name: Run TestNG tests
run: |
./sbt -jvm-opts autotest/.jvmopts "project autotest" \
OldTests/test dumpCoverage
./sbt "project autotest" OldTests/test dumpCoverage

- name: Save TestNG Reports
if: failure()
Expand All @@ -297,8 +295,7 @@ jobs:

- name: Generate coverage report
run: |
./sbt -jvm-opts autotest/.jvmopts "project autotest" \
coverageReport
./sbt "project autotest" coverageReport

# To save significant time on file upload, we first tar up the directory
# as it contains > 10k files and the artefact upload was taking almost
Expand Down Expand Up @@ -348,9 +345,9 @@ jobs:
libimage-exiftool-perl

- name: Set up JDK 21
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: adopt
distribution: temurin
java-version: 21

- name: Setup node
Expand All @@ -375,7 +372,7 @@ jobs:

- name: Install openEquella
run: |
./sbt -jvm-opts autotest/.jvmopts "project autotest" \
./sbt "project autotest" \
installEquella startEquella configureInstall setupForTests

- name: Run tests
Expand All @@ -386,8 +383,7 @@ jobs:
- name: Stop oEQ
if: failure()
run: |
./sbt -jvm-opts autotest/.jvmopts "project autotest" \
stopEquella
./sbt "project autotest" stopEquella

- name: Save oEQ logs for REST Module
if: failure()
Expand Down
4 changes: 2 additions & 2 deletions autotest/.jvmopts → .jvmopts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-Xms2048m
-Xmx2048m
-Xms2g
-Xmx4g
-XX:ReservedCodeCacheSize=256m
-XX:MaxMetaspaceSize=512m
1 change: 0 additions & 1 deletion .sbtopts

This file was deleted.

8 changes: 4 additions & 4 deletions sbt
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@

set -o pipefail

declare -r sbt_release_version="1.5.6"
declare -r sbt_unreleased_version="1.6.0-M1"
declare -r sbt_release_version="1.9.7"
declare -r sbt_unreleased_version="1.9.7"

declare -r latest_213="2.13.7"
declare -r latest_212="2.12.15"
declare -r latest_213="2.13.12"
declare -r latest_212="2.12.18"
declare -r latest_211="2.11.12"
declare -r latest_210="2.10.7"
declare -r latest_29="2.9.3"
Expand Down
Loading