diff --git a/automation/Dockerfile-tests b/automation/Dockerfile-tests index 9b60b2be1..745caa681 100644 --- a/automation/Dockerfile-tests +++ b/automation/Dockerfile-tests @@ -1,4 +1,4 @@ -FROM sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.5_2.13.15 +FROM sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.6_2.13.15 COPY src /app/src COPY test.sh /app diff --git a/automation/project/build.properties b/automation/project/build.properties index c7450fc2a..2a577eee4 100644 --- a/automation/project/build.properties +++ b/automation/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.5 \ No newline at end of file +sbt.version=1.10.6 \ No newline at end of file diff --git a/codegen_java/project/build.properties b/codegen_java/project/build.properties index db1723b08..e88a0d817 100644 --- a/codegen_java/project/build.properties +++ b/codegen_java/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.5 +sbt.version=1.10.6 diff --git a/docker/build.sh b/docker/build.sh index 8b47ce6d1..e6c437d7c 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -96,9 +96,9 @@ function make_jar() GIT_MODEL_HASH=$(git log -n 1 --pretty=format:%h) # make jar. cache sbt dependencies. - docker run --rm --link postgres:postgres -e GIT_MODEL_HASH=$GIT_MODEL_HASH -v $PWD:/working -v jar-cache:/root/.ivy -v jar-cache:/root/.ivy2 sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.5_2.13.15 /working/docker/init_schema.sh /working + docker run --rm --link postgres:postgres -e GIT_MODEL_HASH=$GIT_MODEL_HASH -v $PWD:/working -v jar-cache:/root/.ivy -v jar-cache:/root/.ivy2 sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.6_2.13.15 /working/docker/init_schema.sh /working sleep 40 - docker run --rm --link postgres:postgres -e GIT_MODEL_HASH=$GIT_MODEL_HASH -v $PWD:/working -v jar-cache:/root/.ivy -v jar-cache:/root/.ivy2 sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.5_2.13.15 /working/docker/install.sh /working + docker run --rm --link postgres:postgres -e GIT_MODEL_HASH=$GIT_MODEL_HASH -v $PWD:/working -v jar-cache:/root/.ivy -v jar-cache:/root/.ivy2 sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.6_2.13.15 /working/docker/install.sh /working EXIT_CODE=$? set -e # Turn error detection back on for the rest of the script diff --git a/docker/build_jar.sh b/docker/build_jar.sh index 15e40fd8a..db44562e2 100755 --- a/docker/build_jar.sh +++ b/docker/build_jar.sh @@ -8,7 +8,7 @@ set -e # Get the last commit hash of the model directory and set it as an environment variable GIT_MODEL_HASH=$(git log -n 1 --pretty=format:%h) -docker run --rm -e GIT_MODEL_HASH=$GIT_MODEL_HASH -v $PWD:/working -v jar-cache:/root/.ivy -v jar-cache:/root/.ivy2 sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.5_2.13.15 /working/docker/clean_install.sh /working +docker run --rm -e GIT_MODEL_HASH=$GIT_MODEL_HASH -v $PWD:/working -v jar-cache:/root/.ivy -v jar-cache:/root/.ivy2 sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.6_2.13.15 /working/docker/clean_install.sh /working EXIT_CODE=$? if [ $EXIT_CODE != 0 ]; then diff --git a/project/build.properties b/project/build.properties index db1723b08..e88a0d817 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.5 +sbt.version=1.10.6