Skip to content

Commit 629aefa

Browse files
committed
Bump sbt to 1.9.3 and fix java options: JVM_OPTS => JAVA_OPTS
1 parent 3f64141 commit 629aefa

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

.github/workflows/checks.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- main
1111

1212
env:
13-
GH_JVM_OPTS: "-Xss64m -Xms1024m -XX:MaxMetaspaceSize=1G -Xmx4G -XX:MaxInlineLevel=18 -XX:+UnlockExperimentalVMOptions -XX:+UseJVMCICompiler"
13+
GH_JAVA_OPTS: "-Xss64m -Xms1024m -XX:MaxMetaspaceSize=1G -Xmx4G -XX:MaxInlineLevel=18 -XX:+UnlockExperimentalVMOptions -XX:+UseJVMCICompiler"
1414

1515
jobs:
1616

@@ -46,7 +46,7 @@ jobs:
4646
CURRENT_BRANCH_NAME: ${{ github.ref }}
4747
RUN_ID: ${{ github.run_id }}
4848
RUN_NUMBER: ${{ github.run_number }}
49-
JVM_OPTS: ${{ env.GH_JVM_OPTS }}
49+
JAVA_OPTS: ${{ env.GH_JAVA_OPTS }}
5050
run: |
5151
echo "[BEFORE]CURRENT_BRANCH_NAME=${CURRENT_BRANCH_NAME}"
5252
export CURRENT_BRANCH_NAME="${CURRENT_BRANCH_NAME#refs/heads/}"
@@ -55,7 +55,7 @@ jobs:
5555
echo "RUN_NUMBER=${RUN_NUMBER}"
5656
echo "Push #${PUSH_NUMBER}"
5757
java -version
58-
echo "JVM_OPTS=${JVM_OPTS}"
58+
echo "JAVA_OPTS=${JAVA_OPTS}"
5959
echo "SBT_OPTS=${SBT_OPTS}"
6060
sbt \
6161
"+scalafixAll --check" \
@@ -68,14 +68,14 @@ jobs:
6868
RUN_ID: ${{ github.run_id }}
6969
RUN_NUMBER: ${{ github.run_number }}
7070
PR_NUMBER: ${{ github.event.pull_request.number }}
71-
JVM_OPTS: ${{ env.GH_JVM_OPTS }}
71+
JAVA_OPTS: ${{ env.GH_JAVA_OPTS }}
7272
run: |
7373
echo "Rull request to the '${CURRENT_BRANCH_NAME}' branch"
7474
echo "RUN_ID=${RUN_ID}"
7575
echo "RUN_NUMBER=${RUN_NUMBER}"
7676
echo "PR #${PR_NUMBER}"
7777
java -version
78-
echo "JVM_OPTS=${JVM_OPTS}"
78+
echo "JAVA_OPTS=${JAVA_OPTS}"
7979
echo "SBT_OPTS=${SBT_OPTS}"
8080
sbt \
8181
"+scalafixAll --check" \

.github/workflows/release.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
env:
1212
GH_JAVA_VERSION: "11"
1313
GH_JAVA_DISTRIBUTION: "temurin"
14-
GH_JVM_OPTS: "-Xss64m -Xms1024m -XX:MaxMetaspaceSize=2G -Xmx4G -XX:MaxInlineLevel=18 -XX:+UnlockExperimentalVMOptions -XX:+UseJVMCICompiler"
14+
GH_JAVA_OPTS: "-Xss64m -Xms1024m -XX:MaxMetaspaceSize=2G -Xmx4G -XX:MaxInlineLevel=18 -XX:+UnlockExperimentalVMOptions -XX:+UseJVMCICompiler"
1515

1616
jobs:
1717

@@ -49,15 +49,15 @@ jobs:
4949
CURRENT_BRANCH_NAME: ${{ github.ref }}
5050
RUN_ID: ${{ github.run_id }}
5151
RUN_NUMBER: ${{ github.run_number }}
52-
JVM_OPTS: ${{ env.GH_JVM_OPTS }}
52+
JAVA_OPTS: ${{ env.GH_JAVA_OPTS }}
5353
run: |
5454
echo "[BEFORE]CURRENT_BRANCH_NAME=${CURRENT_BRANCH_NAME}"
5555
export CURRENT_BRANCH_NAME="${CURRENT_BRANCH_NAME#refs/heads/}"
5656
echo " [AFTER]CURRENT_BRANCH_NAME=${CURRENT_BRANCH_NAME}"
5757
echo "RUN_ID=${RUN_ID}"
5858
echo "RUN_NUMBER=${RUN_NUMBER}"
5959
echo "Push #${PUSH_NUMBER}"
60-
echo "JVM_OPTS=${JVM_OPTS}"
60+
echo "JAVA_OPTS=${JAVA_OPTS}"
6161
echo "SBT_OPTS=${SBT_OPTS}"
6262
java -version
6363
sbt \
@@ -93,10 +93,10 @@ jobs:
9393
- name: sbt GitHub Release
9494
env:
9595
GITHUB_TOKEN: ${{ secrets.RELEASE_AUTH_TOKEN_GITHUB }}
96-
JVM_OPTS: ${{ env.GH_JVM_OPTS }}
96+
JAVA_OPTS: ${{ env.GH_JAVA_OPTS }}
9797
run: |
9898
echo "Run] sbt GitHub release"
99-
echo "JVM_OPTS=${JVM_OPTS}"
99+
echo "JAVA_OPTS=${JAVA_OPTS}"
100100
echo "SBT_OPTS=${SBT_OPTS}"
101101
echo 'sbt devOopsGitHubRelease'
102102
sbt \
@@ -137,12 +137,12 @@ jobs:
137137
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
138138
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
139139
GITHUB_TOKEN: ${{ secrets.RELEASE_AUTH_TOKEN_GITHUB }}
140-
JVM_OPTS: ${{ env.GH_JVM_OPTS }}
140+
JAVA_OPTS: ${{ env.GH_JAVA_OPTS }}
141141
run: |
142142
echo "Run] sbt ci-release"
143143
export SOURCE_DATE_EPOCH=$(date +%s)
144144
echo "SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH"
145-
echo "JVM_OPTS=${JVM_OPTS}"
145+
echo "JAVA_OPTS=${JAVA_OPTS}"
146146
echo "SBT_OPTS=${SBT_OPTS}"
147147
echo 'sbt -v clean +packagedArtifacts ci-release'
148148
sbt \
@@ -186,12 +186,12 @@ jobs:
186186
PGP_SECRET: ${{ secrets.PGP_SECRET }}
187187
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
188188
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
189-
JVM_OPTS: ${{ env.GH_JVM_OPTS }}
189+
JAVA_OPTS: ${{ env.GH_JAVA_OPTS }}
190190
run: |
191191
echo "Run] sbt ci-release"
192192
export SOURCE_DATE_EPOCH=$(date +%s)
193193
echo "SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH"
194-
echo "JVM_OPTS=${JVM_OPTS}"
194+
echo "JAVA_OPTS=${JAVA_OPTS}"
195195
echo "SBT_OPTS=${SBT_OPTS}"
196196
sbt \
197197
-v \

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.8.2
1+
sbt.version=1.9.3

0 commit comments

Comments
 (0)