diff --git a/.gitignore b/.gitignore index 76efab50ebb3..94c8564558fc 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ dependency-reduced-pom.xml apache-hive-3.1.3-bin-gdp-*.tar.gz hive_build_dist/ .devcontainer/.devpod-internal/ +*.patch diff --git a/justfile b/justfile index 45cbc050a898..b1137131dc45 100644 --- a/justfile +++ b/justfile @@ -1,9 +1,5 @@ # Hive Development Build and Management Tasks -## Variables -main_hive2_branch := "6si-main" -main_hive3_branch := "6si-hive3-main" - set shell := ["bash", "-c"] # Default recipe - show help @@ -91,7 +87,7 @@ clean: # Build entire project with distribution package build-without-tests: echo "=== building without tests ===" - #mvn clean install -Pdist -Dtar -DskipTests=true -Dmaven.javadoc.skip=true + mvn clean install -Pdist -Dtar -DskipTests=true -Dmaven.javadoc.skip=true # Build with tests (slower, comprehensive) build-with-tests: @@ -105,7 +101,7 @@ pull-main: branch="$(git branch --show-current 2>/dev/null || true)" commit="$(git rev-parse --short HEAD 2>/dev/null || true)" fi - if [ -n "${branch}" ] && { [ "${branch}" = "${main_hive2_branch}" ] || [ "${branch}" = "${main_hive3_branch}" ]; }; then + if [ -n "${branch}" ] && { [ "${branch}" = "6si-main" ] || [ "${branch}" = "6si-hive3-main" ]; }; then echo "Current branch is ${branch}, pulling latest changes..." git pull origin "${branch}" echo "Pull completed"