diff --git a/tools/zip-sources-all.sh b/tools/zip-sources-all.sh index c1bb362ef..de4eae6ee 100755 --- a/tools/zip-sources-all.sh +++ b/tools/zip-sources-all.sh @@ -69,7 +69,7 @@ function zip_sources() { exit 1 fi - #Remove unnecessary dirs + #Remove unnecessary content pushd $REPO_DIRECTORY CURRENT_DIRECTORY=$(pwd) echo "Current directory is ${CURRENT_DIRECTORY}" @@ -80,6 +80,8 @@ function zip_sources() { echo ".git directory found, deleting..." rm -rf ".git" fi + echo "remove legal files" + rm -f "LICENSE" "NOTICE" "DISCLAIMER" "DISCLAIMER-WIP" "LICENSE-Apache-2.0.txt" "LICENSE.txt" echo "After .git removal" ls -lha popd @@ -87,8 +89,8 @@ function zip_sources() { done <<< $SOURCES_REPOSITORIES #Add LICENSE, NOTICE and DISCLAIMER files to the root folder of the zip file - echo "Adding LICENSE, NOTICE and DISCLAIMER files to the zip file" - cp ./tools/zip-sources-files/{LICENSE,NOTICE,DISCLAIMER} ${SOURCES_DIRECTORY_NAME} + echo "Adding LICENSE, NOTICE, DISCLAIMER-WIP, BUILD and build.sh files to the zip file" + cp ./tools/zip-sources-files/{LICENSE,NOTICE,DISCLAIMER-WIP,BUILD,build.sh} ${SOURCES_DIRECTORY_NAME} #Creating ZIP pushd ${SOURCES_DIRECTORY_NAME} diff --git a/tools/zip-sources-files/build.sh b/tools/zip-sources-files/build.sh index d59dcdad0..8b21295d4 100755 --- a/tools/zip-sources-files/build.sh +++ b/tools/zip-sources-files/build.sh @@ -4,14 +4,14 @@ # Check required tools check_requirements() { local requirements=( - "java:17.0.11" + "java:17.0.12" "mvn:3.9.6" "docker:25" "python3:3.12" - "make:4.3" + "make:4.4" "node:20" "pnpm:9.3.0" - "go:1.21.9" + "go:1.23.6" "helm:3.15.2" ) @@ -23,9 +23,6 @@ check_requirements() { exit 1 fi done - - # Check Python packages - pip3 install cekit==4.11.0 docker==7.0.0 docker-squash==1.2.0 ruamel.yaml==0.18.5 } # Set Docker host based on container runtime @@ -62,24 +59,6 @@ build_components() { mvn clean install -DskipTests -Dfull -Donly.reproducible=true -Pjitexecutor-native cd .. - # Build Kogito Images - cd incubator-kie-kogito-images || exit 1 - cekit --descriptor kogito-base-builder-image.yaml build docker --platform linux/amd64 - - local images=( - "kogito-data-index-ephemeral" - "kogito-data-index-postgresql" - "kogito-jit-runner" - "kogito-jobs-service-allinone" - "kogito-jobs-service-ephemeral" - "kogito-jobs-service-postgresql" - ) - - for image in "${images[@]}"; do - make build-image KOGITO_APPS_TARGET_BRANCH=main ignore_test=true image_name="$image" - done - cd .. - # Build KIE Tools cd incubator-kie-tools || exit 1 git init .