Skip to content

Commit 617d242

Browse files
authored
fix code pipeline (#922)
1 parent 5232ac4 commit 617d242

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

.builder/actions/aws_crt_java_build.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@ class AWSCrtJavaBuild(Builder.Action):
88

99
def run(self, env):
1010
if os.getenv("CRT_FIPS") is not None:
11-
env.shell.exec("mvn", "-P", "continuous-integration", "-B", "compile",
11+
env.shell.exec("mvn", "-Dmaven.wagon.http.retryHandler.class=standard", "-Dmaven.wagon.http.retryHandler.count=3", "-Dmaven.wagon.http.pool=false", "-P", "continuous-integration", "-B", "compile",
1212
"-Dcmake.crt_fips=ON", check=True)
1313
else:
14-
env.shell.exec("mvn", "-P", "continuous-integration",
14+
env.shell.exec("mvn", "-Dmaven.wagon.http.retryHandler.class=standard", "-Dmaven.wagon.http.retryHandler.count=3", "-Dmaven.wagon.http.pool=false", "-P", "continuous-integration",
1515
"-B", "compile", check=True)
1616

1717
parser = argparse.ArgumentParser()
1818
parser.add_argument('--classifier')
1919
args = parser.parse_known_args(env.args.args)[0]
2020
if args.classifier:
2121
env.shell.exec("mvn", "-B", "install", "-DskipTests", "-Dshared-lib.skip=true",
22+
"-Dmaven.wagon.http.retryHandler.class=standard","-Dmaven.wagon.http.retryHandler.count=3", "-Dmaven.wagon.http.pool=false",
2223
f"-Dcrt.classifier={args.classifier}", check=True)

codebuild/cd/musl-linux-build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ shift
1313
BUILDER_VERSION=$(cat .github/workflows/ci.yml | grep 'BUILDER_VERSION:' | sed 's/\s*BUILDER_VERSION:\s*\(.*\)/\1/')
1414
echo "Using builder version ${BUILDER_VERSION}"
1515

16-
aws ecr get-login-password | docker login 123124136734.dkr.ecr.us-east-1.amazonaws.com -u AWS --password-stdin
16+
aws ecr get-login-password --region us-east-1 | docker login 123124136734.dkr.ecr.us-east-1.amazonaws.com -u AWS --password-stdin
1717
export DOCKER_IMAGE=123124136734.dkr.ecr.us-east-1.amazonaws.com/${IMAGE_NAME}:${BUILDER_VERSION}
1818

19-
# on x86-64 and aarch64 we run on native images in codebuild
19+
# on x86-64 and aarch64 we run on native images in codebuild
2020
# on other platforms we require emulation which is done through binfmt
21-
if [ "$ARCH" != "linux/aarch64" ]; then
21+
if [ "$ARCH" != "linux/aarch64" ]; then
2222
export QEMU_IMAGE=123124136734.dkr.ecr.us-east-1.amazonaws.com/multiarch-qemu-user-static:latest
2323
docker run --rm --privileged ${QEMU_IMAGE} --reset -p yes
2424
fi

0 commit comments

Comments
 (0)