digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 01:07:18 +03:00
Code Issues Projects Releases Wiki Activity

ci/cron/check: remove dade-assist calls (#9048)

Browse Source 
* ci/cron/check: remove dade-assist calls

We can only run this in a context where the dev-env is already set up
anyway, as that's how we get Bazel to build the script in the first
place.

CHANGELOG_BEGIN
CHANGELOG_END

* remove skip_java logic
This commit is contained in:
Gary Verhaegen 2021-03-08 14:55:19 +01:00 committed by GitHub
parent 85f0965ab9
commit caa023b72e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ci/cron/src/Main.hs
View File

@ -344,8 +344,6 @@ verify_signatures :: FilePath -> FilePath -> String -> IO ()
verify_signatures bash_lib tmp version_tag = do
System.callCommand $ unlines ["bash -c '",
"set -euo pipefail",
"export DADE_SKIP_JAVA=1",
"eval \"$(dev-env/bin/dade assist)\"",
"source \"" <> bash_lib <> "\"",
"shopt -s extglob", -- enable !() pattern: things that _don't_ match
"cd \"" <> tmp <> "\"",
@ -371,8 +369,6 @@ does_backup_exist :: String -> FilePath -> FilePath -> IO Bool
does_backup_exist gcp_credentials bash_lib path = do
out <- shell $ unlines ["bash -c '",
"set -euo pipefail",
"export DADE_SKIP_JAVA=1",
"eval \"$(dev-env/bin/dade assist)\"",
"source \"" <> bash_lib <> "\"",
"GCRED=$(cat <<END",
gcp_credentials,
@ -390,8 +386,6 @@ gcs_cp :: String -> FilePath -> FilePath -> FilePath -> IO ()
gcs_cp gcp_credentials bash_lib local_path remote_path = do
shell_ $ unlines ["bash -c '",
"set -euo pipefail",
"export DADE_SKIP_JAVA=1",
"eval \"$(dev-env/bin/dade assist)\"",
"source \"" <> bash_lib <> "\"",
"GCRED=$(cat <<END",
gcp_credentials,

6
dev-env/bin/dade-assist
View File

@ -2,7 +2,7 @@
DADE_CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source "$DADE_CURRENT_SCRIPT_DIR/../lib/dade-common"
if [ -z "${DADE_SKIP_JAVA+1}" ]; then
linkTool java out "${DADE_DEVENV_DIR}/jdk"
fi
linkTool java out "${DADE_DEVENV_DIR}/jdk"
exec "${DADE_DEVENV_DIR}/lib/dade-dump-profile"