From 0fc7ed050c0c1cb2855f583d92cf581e595f37ca Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Wed, 30 Oct 2024 18:38:33 +0000 Subject: [PATCH] wip: nixify --- devops/.env.sh | 5 +++-- devops/coverage.sh | 1 - devops/gen-js.sh | 1 - devops/gen-jsonly.sh | 1 - devops/gen.sh | 1 - devops/publish-scala.sh | 2 -- devops/site-publish.sh | 2 -- devops/site-test.sh | 1 - devops/test.sh | 1 - 9 files changed, 3 insertions(+), 12 deletions(-) diff --git a/devops/.env.sh b/devops/.env.sh index 5c782aef6c..e76f47fe49 100755 --- a/devops/.env.sh +++ b/devops/.env.sh @@ -3,7 +3,6 @@ set -e set -x -export _JAVA_OPTIONS="-Xmx4000M -XX:ReservedCodeCacheSize=384M -XX:NonProfiledCodeHeapSize=256M -XX:MaxMetaspaceSize=1024M" export SCALA212=$(cat project/Deps.sc | grep 'val scala212 ' | sed -r 's/.*\"(.*)\".**/\1/') export SCALA213=$(cat project/Deps.sc | grep 'val scala213 ' | sed -r 's/.*\"(.*)\".**/\1/') @@ -27,4 +26,6 @@ export JAVA_HOME="${!JDK_VERSION_VAR}" export PATH=$JAVA_HOME/bin:$PATH export COURSIER_CACHE="$HOME/.cache/coursier" -mkdir -p "${COURSIER_CACHE}" \ No newline at end of file +mkdir -p "${COURSIER_CACHE}" + +export _JAVA_OPTIONS="-Dcoursier.cache=${COURSIER_CACHE} -Xmx4000M -XX:ReservedCodeCacheSize=384M -XX:NonProfiledCodeHeapSize=256M -XX:MaxMetaspaceSize=1024M" diff --git a/devops/coverage.sh b/devops/coverage.sh index 3b61479739..e2e47d1eab 100755 --- a/devops/coverage.sh +++ b/devops/coverage.sh @@ -4,7 +4,6 @@ set -e set -x source ./devops/.env.sh -printenv sbt -batch -no-colors -v \ "$VERSION_COMMAND clean" \ diff --git a/devops/gen-js.sh b/devops/gen-js.sh index 18b668611b..4db4d823a8 100755 --- a/devops/gen-js.sh +++ b/devops/gen-js.sh @@ -4,6 +4,5 @@ set -e set -x source ./devops/.env.sh -printenv bash sbtgen.sc --js \ No newline at end of file diff --git a/devops/gen-jsonly.sh b/devops/gen-jsonly.sh index 1e202d2e1d..7bfd7e2118 100755 --- a/devops/gen-jsonly.sh +++ b/devops/gen-jsonly.sh @@ -4,6 +4,5 @@ set -e set -x source ./devops/.env.sh -printenv bash sbtgen.sc --nojvm --js \ No newline at end of file diff --git a/devops/gen.sh b/devops/gen.sh index cad7b9b7d4..7ce89e4de6 100755 --- a/devops/gen.sh +++ b/devops/gen.sh @@ -4,6 +4,5 @@ set -e set -x source ./devops/.env.sh -printenv bash sbtgen.sc \ No newline at end of file diff --git a/devops/publish-scala.sh b/devops/publish-scala.sh index 17f58022f1..3f7fdd0180 100755 --- a/devops/publish-scala.sh +++ b/devops/publish-scala.sh @@ -4,8 +4,6 @@ set -e set -x source ./devops/.env.sh -printenv - source ./devops/.validate-publishing.sh [[ ! -f "$SONATYPE_SECRET" ]] && echo "SONATYPE_SECRET=$SONATYPE_SECRET is not a file" && exit 0 diff --git a/devops/site-publish.sh b/devops/site-publish.sh index a087d19b9c..d7d9405c56 100755 --- a/devops/site-publish.sh +++ b/devops/site-publish.sh @@ -4,8 +4,6 @@ set -e set -x source ./devops/.env.sh -printenv - source ./devops/.validate-publishing.sh sbt -batch -no-colors -v \ diff --git a/devops/site-test.sh b/devops/site-test.sh index 0233a8be81..d9009f2e73 100755 --- a/devops/site-test.sh +++ b/devops/site-test.sh @@ -4,7 +4,6 @@ set -e set -x source ./devops/.env.sh -printenv sbt -batch -no-colors -v \ "project docs" \ diff --git a/devops/test.sh b/devops/test.sh index 803ec00737..8fd9f255ca 100755 --- a/devops/test.sh +++ b/devops/test.sh @@ -4,7 +4,6 @@ set -e set -x source ./devops/.env.sh -printenv sbt -batch -no-colors -v \ "$VERSION_COMMAND clean" \