Skip to content

Commit 3275ab4

Browse files
committed
switch to branch version of crt-builder and use local project dir for gradlew path
1 parent 5b71099 commit 3275ab4

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
- '!main'
88

99
env:
10-
BUILDER_VERSION: v0.7.7
11-
BUILDER_SOURCE: releases
10+
BUILDER_VERSION: fix-dependency-steps
11+
BUILDER_SOURCE: channels
1212
BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
1313
PACKAGE_NAME: aws-crt-kotlin
1414
LINUX_BASE_IMAGE: ubuntu-16-x64
@@ -34,5 +34,5 @@ jobs:
3434
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ matrix.image }}:${{ env.BUILDER_VERSION }}
3535
docker pull $DOCKER_IMAGE
3636
docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} \
37-
--env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --build-dir=/root/${{ env.PACKAGE_NAME }} --spec=downstream
37+
--env GITHUB_REF $DOCKER_IMAGE --version $BUILDER_VERSION build -p ${{ env.PACKAGE_NAME }} --build-dir=/root/${{ env.PACKAGE_NAME }} --spec=downstream
3838

builder.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
{
22
"name": "aws-crt-kotlin",
33
"packages": [],
4+
"variables": {
5+
"gradlew": "{project_source_dir}/gradlew -p {project_source_dir}"
6+
},
47
"build_steps": [
5-
"./gradlew -x test -x allTests -x jvmTest build"
8+
"{gradlew} -x test -x allTests -x jvmTest build"
69
],
710
"post_build_steps": [
8-
"./gradlew publishToMavenLocal"
11+
"{gradlew} publishToMavenLocal"
912
],
1013
"test_steps": [
11-
"./gradlew test allTests"
14+
"{gradlew} test allTests"
1215
],
1316
"imports": [
1417
"JDK8"
@@ -38,10 +41,10 @@
3841
"s2n"
3942
],
4043
"!build_steps": [
41-
"./gradlew -x test -x allTests -x jvmTest build -Dlibcrypto.path={libcrypto_path}"
44+
"{gradlew} -x test -x allTests -x jvmTest build -Dlibcrypto.path={libcrypto_path}"
4245
],
4346
"!test_steps": [
44-
"./gradlew test allTests -Dlibcrypto.path={libcrypto_path}"
47+
"{gradlew} test allTests -Dlibcrypto.path={libcrypto_path}"
4548
]
4649
}
4750
}

0 commit comments

Comments
 (0)