Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add `shellcheck.py` and apply first round of fixes #7698

Merged
merged 19 commits into from May 14, 2019
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Fix some issues with bin/native

  • Loading branch information...
Eric-Arellano committed Apr 27, 2019
commit d11457c3bf6f48b077952f32ac616bf2c72c2f12
@@ -4,6 +4,7 @@ set -e

REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd ../../.. && pwd -P)"

# shellcheck source=build-support/pants_venv
source "${REPO_ROOT}/build-support/pants_venv"

if (( $# != 2 )); then
@@ -5,7 +5,9 @@ REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd ../../.. && pwd -P)"
# Exposes:
# + die: Exit in a failure state and optionally log an error message to the console.
# + fingerprint_data: Fingerprints the data on stdin.
source ${REPO_ROOT}/build-support/common.sh

# shellcheck source=build-support/common.sh
source "${REPO_ROOT}/build-support/common.sh"

KERNEL=$(uname -s | tr '[:upper:]' '[:lower:]')
case "${KERNEL}" in
@@ -40,7 +42,7 @@ function calculate_current_hash() {
#
# Assumes we're in the venv that will be used to build the native engine.
(
cd ${REPO_ROOT}
cd "${REPO_ROOT}" || exit
(echo "${MODE_FLAG}"
echo "${RUST_TOOLCHAIN}"
uname
@@ -69,7 +71,8 @@ function _build_native_code() {

function bootstrap_native_code() {
# Bootstraps the native code only if needed.
local native_engine_version="$(calculate_current_hash)"
local native_engine_version
native_engine_version="$(calculate_current_hash)"
local engine_version_hdr="engine_version: ${native_engine_version}"
local target_binary="${NATIVE_ENGINE_CACHE_DIR}/${native_engine_version}/${NATIVE_ENGINE_BINARY}"
local target_binary_metadata="${target_binary}.metadata"
@@ -90,7 +93,7 @@ function bootstrap_native_code() {
target_binary="${NATIVE_ENGINE_CACHE_DIR}/${native_engine_version}/${NATIVE_ENGINE_BINARY}"
target_binary_metadata="${target_binary}.metadata"

mkdir -p "$(dirname ${target_binary})"
mkdir -p "$(dirname "${target_binary}")"
cp "${native_binary}" "${target_binary}"

local -r metadata_file=$(mktemp -t pants.native_engine.metadata.XXXXXX)
@@ -5,6 +5,8 @@ REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd ../../.. && pwd -P)"
# Exposes:
# + log: Log a message to the console.
# + fingerprint_data: Fingerprints the data on stdin.

# shellcheck source=build-support/common.sh
source "${REPO_ROOT}/build-support/common.sh"

rust_toolchain_root="${CACHE_ROOT}/rust"
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.