Skip to content

Commit

Permalink
ci/cron/check: remove dade-assist calls (#9048)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
garyverhaegen-da committed Mar 8, 2021
1 parent 85f0965 commit caa023b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
6 changes: 0 additions & 6 deletions ci/cron/src/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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 <> "\"",
Expand All @@ -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,
Expand All @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions dev-env/bin/dade-assist
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit caa023b

Please sign in to comment.