Skip to content

Commit

Permalink
Move confirm script into scripts/tools (#21626)
Browse files Browse the repository at this point in the history
  • Loading branch information
jedcunningham authored Feb 17, 2022
1 parent 42469f0 commit 074b0c9
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 6 deletions.
1 change: 0 additions & 1 deletion .github/boring-cyborg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ labelPRBasedOnFilePath:
- Dockerfile.ci
- BREEZE.rst
- breeze-complete
- confirm
- CONTRIBUTING.*
- LOCAL_VIRTUALENV.rst
- STATIC_CODE_CHECKS.rst
Expand Down
4 changes: 2 additions & 2 deletions breeze
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ function breeze::initialize_virtualenv() {
echo
echo "This will wipe out ${AIRFLOW_HOME_DIR} and reset all the databases!"
echo
"${AIRFLOW_SOURCES}/confirm" "Proceeding with the initialization"
"${AIRFLOW_SOURCES}/scripts/tools/confirm" "Proceeding with the initialization"
echo
pushd "${AIRFLOW_SOURCES}" >/dev/null 2>&1 || exit 1
set +e
Expand Down Expand Up @@ -329,7 +329,7 @@ function breeze::initialize_virtualenv() {
function breeze::setup_autocomplete() {
echo "Installing bash/zsh completion for local user"
echo
"${AIRFLOW_SOURCES}/confirm" "This will create ~/.bash_completion.d/ directory and modify ~/.*rc files"
"${AIRFLOW_SOURCES}/scripts/tools/confirm" "This will create ~/.bash_completion.d/ directory and modify ~/.*rc files"
echo
echo
mkdir -pv ~/.bash_completion.d
Expand Down
1 change: 0 additions & 1 deletion dev/airflow-github
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ def is_core_commit(files: List[str]) -> bool:
# dev/release/testing
"breeze",
"codecov.yml",
"confirm",
"pytest.ini",
"kubernetes_tests/",
".github/",
Expand Down
4 changes: 2 additions & 2 deletions scripts/ci/libraries/_build_images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ function build_images::reconfirm_rebuilding_if_not_rebased() {
echo
echo "${COLOR_YELLOW}It is STRONGLY RECOMMENDED that you rebase your code first!${COLOR_RESET}"
echo
"${AIRFLOW_SOURCES}/confirm" "You are really sure you want to rebuild ${THE_IMAGE_TYPE}-python${PYTHON_MAJOR_MINOR_VERSION}"
"${AIRFLOW_SOURCES}/scripts/tools/confirm" "You are really sure you want to rebuild ${THE_IMAGE_TYPE}-python${PYTHON_MAJOR_MINOR_VERSION}"
RES=$?
fi
}
Expand Down Expand Up @@ -135,7 +135,7 @@ function build_images::confirm_rebuilding_on_modified_files() {
# Make sure to use output of tty rather than stdin/stdout when available - this way confirm
# will works also in case of pre-commits (git does not pass stdin/stdout to pre-commit hooks)
# shellcheck disable=SC2094
"${AIRFLOW_SOURCES}/confirm" "PULL & BUILD the image ${THE_IMAGE_TYPE}-python${PYTHON_MAJOR_MINOR_VERSION}"
"${AIRFLOW_SOURCES}/scripts/tools/confirm" "PULL & BUILD the image ${THE_IMAGE_TYPE}-python${PYTHON_MAJOR_MINOR_VERSION}"
RES=$?
if [[ ${RES} == "0" ]]; then
build_images::reconfirm_rebuilding_if_not_rebased
Expand Down
File renamed without changes.

0 comments on commit 074b0c9

Please sign in to comment.