natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Ekaterina Dimitrova 2021-04-08 18:22:41 -04:00
parent 29e4612e88 80beb83cf9
commit 4795e23c82
5 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.circleci/config-2_1.yml
View File

@ -816,6 +816,7 @@ commands:
git remote set-branches --add apache '$branch' git remote set-branches --add apache '$branch'
git fetch --depth 1 apache $branch git fetch --depth 1 apache $branch
git checkout $branch git checkout $branch
git clean -fd
# Loop to prevent failure due to maven-ant-tasks not downloading a jar.. # Loop to prevent failure due to maven-ant-tasks not downloading a jar..
for x in $(seq 1 3); do for x in $(seq 1 3); do
${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
@ -832,7 +833,9 @@ commands:
fi fi
done done
# and build the dtest-jar for the branch under test # and build the dtest-jar for the branch under test
${ANT_HOME}/bin/ant realclean
git checkout origin/$CIRCLE_BRANCH git checkout origin/$CIRCLE_BRANCH
git clean -fd
for x in $(seq 1 3); do for x in $(seq 1 3); do
${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
RETURN="$?" RETURN="$?"

3
.circleci/config.yml
View File

@ -2358,6 +2358,7 @@ jobs:
git remote set-branches --add apache '$branch' git remote set-branches --add apache '$branch'
git fetch --depth 1 apache $branch git fetch --depth 1 apache $branch
git checkout $branch git checkout $branch
git clean -fd
# Loop to prevent failure due to maven-ant-tasks not downloading a jar.. # Loop to prevent failure due to maven-ant-tasks not downloading a jar..
for x in $(seq 1 3); do for x in $(seq 1 3); do
${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
@ -2374,7 +2375,9 @@ jobs:
fi fi
done done
# and build the dtest-jar for the branch under test # and build the dtest-jar for the branch under test
${ANT_HOME}/bin/ant realclean
git checkout origin/$CIRCLE_BRANCH git checkout origin/$CIRCLE_BRANCH
git clean -fd
for x in $(seq 1 3); do for x in $(seq 1 3); do
${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
RETURN="$?" RETURN="$?"

3
.circleci/config.yml.HIGHRES
View File

@ -2358,6 +2358,7 @@ jobs:
git remote set-branches --add apache '$branch' git remote set-branches --add apache '$branch'
git fetch --depth 1 apache $branch git fetch --depth 1 apache $branch
git checkout $branch git checkout $branch
git clean -fd
# Loop to prevent failure due to maven-ant-tasks not downloading a jar.. # Loop to prevent failure due to maven-ant-tasks not downloading a jar..
for x in $(seq 1 3); do for x in $(seq 1 3); do
${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
@ -2374,7 +2375,9 @@ jobs:
fi fi
done done
# and build the dtest-jar for the branch under test # and build the dtest-jar for the branch under test
${ANT_HOME}/bin/ant realclean
git checkout origin/$CIRCLE_BRANCH git checkout origin/$CIRCLE_BRANCH
git clean -fd
for x in $(seq 1 3); do for x in $(seq 1 3); do
${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
RETURN="$?" RETURN="$?"

3
.circleci/config.yml.LOWRES
View File

@ -2358,6 +2358,7 @@ jobs:
git remote set-branches --add apache '$branch' git remote set-branches --add apache '$branch'
git fetch --depth 1 apache $branch git fetch --depth 1 apache $branch
git checkout $branch git checkout $branch
git clean -fd
# Loop to prevent failure due to maven-ant-tasks not downloading a jar.. # Loop to prevent failure due to maven-ant-tasks not downloading a jar..
for x in $(seq 1 3); do for x in $(seq 1 3); do
${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
@ -2374,7 +2375,9 @@ jobs:
fi fi
done done
# and build the dtest-jar for the branch under test # and build the dtest-jar for the branch under test
${ANT_HOME}/bin/ant realclean
git checkout origin/$CIRCLE_BRANCH git checkout origin/$CIRCLE_BRANCH
git clean -fd
for x in $(seq 1 3); do for x in $(seq 1 3); do
${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
RETURN="$?" RETURN="$?"

3
.circleci/config.yml.MIDRES
View File

@ -2358,6 +2358,7 @@ jobs:
git remote set-branches --add apache '$branch' git remote set-branches --add apache '$branch'
git fetch --depth 1 apache $branch git fetch --depth 1 apache $branch
git checkout $branch git checkout $branch
git clean -fd
# Loop to prevent failure due to maven-ant-tasks not downloading a jar.. # Loop to prevent failure due to maven-ant-tasks not downloading a jar..
for x in $(seq 1 3); do for x in $(seq 1 3); do
${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
@ -2374,7 +2375,9 @@ jobs:
fi fi
done done
# and build the dtest-jar for the branch under test # and build the dtest-jar for the branch under test
${ANT_HOME}/bin/ant realclean
git checkout origin/$CIRCLE_BRANCH git checkout origin/$CIRCLE_BRANCH
git clean -fd
for x in $(seq 1 3); do for x in $(seq 1 3); do
${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
RETURN="$?" RETURN="$?"