Revert "Only do a partial build for a few jobs when verify PRs (#11464)"
This reverts commit e5adc1131a
.
This commit is contained in:
parent
df22356a3a
commit
98c446c493
@ -21,38 +21,12 @@ if [ "$#" -lt 2 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
git fetch
|
||||
|
||||
ALL_MODULES=$(find . -name pom.xml | cut -d '/' -f 2 )
|
||||
MODULES=$(git diff --name-only "$1" | cut -d '/' -f 1 | sort -u | sed -n -e 'H;${x;s/\n/,/g;s/^,//;p;}')
|
||||
MAVEN_ARGUMENTS=${*:2}
|
||||
if [ -z "$MODULES" ]; then
|
||||
echo "No changes detected, skipping build"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
ALL_MODULES_ARRAY=($ALL_MODULES)
|
||||
MODULES_ARRAY=($MODULES)
|
||||
|
||||
for module in "${MODULES_ARRAY[@]}"
|
||||
do
|
||||
found=0;
|
||||
for m in "${ALL_MODULES_ARRAY[@]}"
|
||||
do
|
||||
if [ "$module" == "$m" ]; then
|
||||
found=1;
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "$found" != 1 ]; then
|
||||
echo "Can't detect module that changed, run a full build"
|
||||
echo "./mvnw $MAVEN_ARGUMENTS"
|
||||
./mvnw "${@:2}"
|
||||
exit 0
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Changes detected, start the build"
|
||||
echo "./mvnw -pl $MODULES -amd $MAVEN_ARGUMENTS"
|
||||
./mvnw -pl "$MODULES" -amd "${@:2}"
|
10
.github/workflows/ci-pr.yml
vendored
10
.github/workflows/ci-pr.yml
vendored
@ -135,16 +135,16 @@ jobs:
|
||||
include:
|
||||
- setup: linux-x86_64-java8
|
||||
docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.18.yaml build"
|
||||
docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.18.yaml run partly-build-leak"
|
||||
docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.18.yaml run build-leak"
|
||||
- setup: linux-x86_64-java11
|
||||
docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml build"
|
||||
docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml run partly-build-leak"
|
||||
docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml run build-leak"
|
||||
- setup: linux-x86_64-java11-graal
|
||||
docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.graalvm111.yaml build"
|
||||
docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.graalvm111.yaml run partly-build-leak"
|
||||
docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.graalvm111.yaml run build-leak"
|
||||
- setup: linux-x86_64-java16
|
||||
docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.116.yaml build"
|
||||
docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.116.yaml run partly-build-leak"
|
||||
docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.116.yaml run build-leak"
|
||||
- setup: linux-x86_64-java11-boringssl
|
||||
docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml build"
|
||||
docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml run build-leak-boringssl-static"
|
||||
@ -177,8 +177,6 @@ jobs:
|
||||
run: docker-compose ${{ matrix.docker-compose-build }}
|
||||
|
||||
- name: Build project with leak detection
|
||||
env:
|
||||
BRANCH: origin/${{ github.base_ref }}
|
||||
run: docker-compose ${{ matrix.docker-compose-run }} | tee build-leak.output
|
||||
|
||||
- name: Checking for test failures
|
||||
|
@ -22,9 +22,3 @@ services:
|
||||
|
||||
shell:
|
||||
image: netty:centos-6-1.11
|
||||
|
||||
partly-build-leak:
|
||||
image: netty:centos-6-1.11
|
||||
|
||||
partly-build-leak-boringssl-static:
|
||||
image: netty:centos-6-1.11
|
||||
|
@ -22,9 +22,3 @@ services:
|
||||
|
||||
shell:
|
||||
image: netty:centos-6-1.16
|
||||
|
||||
partly-build-leak:
|
||||
image: netty:centos-6-1.16
|
||||
|
||||
partly-build-leak-boringssl-static:
|
||||
image: netty:centos-6-1.16
|
||||
|
@ -31,9 +31,3 @@ services:
|
||||
|
||||
shell:
|
||||
image: netty:centos-6-1.8
|
||||
|
||||
partly-build-leak:
|
||||
image: netty:centos-6-1.8
|
||||
|
||||
partly-build-leak-boringssl-static:
|
||||
image: netty:centos-6-1.8
|
||||
|
@ -22,9 +22,3 @@ services:
|
||||
|
||||
shell:
|
||||
image: netty:centos-6-1.11
|
||||
|
||||
partly-build-leak:
|
||||
image: netty:centos-6-1.11
|
||||
|
||||
partly-build-leak-boringssl-static:
|
||||
image: netty:centos-6-1.11
|
||||
|
@ -22,9 +22,3 @@ services:
|
||||
|
||||
shell:
|
||||
image: netty:centos-6-1.8
|
||||
|
||||
partly-build-leak:
|
||||
image: netty:centos-6-1.8
|
||||
|
||||
partly-build-leak-boringssl-static:
|
||||
image: netty:centos-6-1.8
|
||||
|
@ -22,9 +22,3 @@ services:
|
||||
|
||||
shell:
|
||||
image: netty:centos-6-openj9-1.11
|
||||
|
||||
partly-build-leak:
|
||||
image: netty:centos-6-openj9-1.11
|
||||
|
||||
partly-build-leak-boringssl-static:
|
||||
image: netty:centos-6-openj9-1.11
|
||||
|
@ -16,7 +16,6 @@ services:
|
||||
- GPG_PASSPHRASE
|
||||
- GPG_PRIVATE_KEY
|
||||
- MAVEN_OPTS
|
||||
- BRANCH
|
||||
volumes:
|
||||
- ~/.ssh:/root/.ssh
|
||||
- ~/.gnupg:/root/.gnupg
|
||||
@ -28,10 +27,6 @@ services:
|
||||
<<: *common
|
||||
command: /bin/bash -cl "./mvnw -B -ntp -Pleak clean install -Dio.netty.testsuite.badHost=netty.io -Dtcnative.classifier=linux-x86_64-fedora"
|
||||
|
||||
partly-build-leak:
|
||||
<<: *common
|
||||
command: /bin/bash -cl "./.github/scripts/mvn_build_affected_only.sh ${BRANCH} -B -ntp -Pleak clean install -Dio.netty.testsuite.badHost=netty.io -Dtcnative.classifier=linux-x86_64-fedora"
|
||||
|
||||
build:
|
||||
<<: *common
|
||||
command: /bin/bash -cl "./mvnw -B -ntp clean install -Dio.netty.testsuite.badHost=netty.io -Dtcnative.classifier=linux-x86_64-fedora"
|
||||
@ -67,11 +62,6 @@ services:
|
||||
<<: *common
|
||||
command: /bin/bash -cl "./mvnw -B -ntp -Pboringssl,leak clean install -Dio.netty.testsuite.badHost=netty.io -Dxml.skip=true"
|
||||
|
||||
|
||||
partly-build-leak-boringssl-static:
|
||||
<<: *common
|
||||
command: /bin/bash -cl "./.github/scripts/mvn_build_affected_only.sh ${BRANCH} -B -ntp -Pboringssl,leak clean install -Dio.netty.testsuite.badHost=netty.io -Dxml.skip=true"
|
||||
|
||||
shell:
|
||||
<<: *common
|
||||
entrypoint: /bin/bash
|
||||
|
Loading…
Reference in New Issue
Block a user