Skip to content

Commit fb30b38

Browse files
authored
fix: use same aws-crt-swift version in aws-sdk-swift as smithy-swift (#822)
1 parent 6d7c4a1 commit fb30b38

File tree

5 files changed

+708
-727
lines changed

5 files changed

+708
-727
lines changed

.github/workflows/release.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ env:
1212
PACKAGE_NAME: aws-sdk-swift
1313
LINUX_BASE_IMAGE: ubuntu-16-x64
1414
RUN: ${{ github.run_id }}-${{ github.run_number }}
15-
AWS_SDK_SWIFT_CI_DIR: /Users/runner/work/aws-sdk-swift/aws-sdk-swift
16-
AWS_CRT_SWIFT_CI_DIR: /Users/runner/work/aws-sdk-swift/aws-sdk-swift/target/build/deps/aws-crt-swift
17-
SMITHY_SWIFT_CI_DIR: /Users/runner/work/aws-sdk-swift/aws-sdk-swift/target/build/deps/smithy-swift
1815

1916
# This release script is work in progress. We will need to update the script to
2017
# * Ensure that unit tests pass for all targets prior to generating a release
@@ -42,16 +39,21 @@ jobs:
4239
with:
4340
java-version: '11'
4441
- name: Build and Test ${{ env.PACKAGE_NAME }}
42+
env:
43+
AWS_SDK_SWIFT_CI_DIR: /Users/runner/work/aws-sdk-swift/aws-sdk-swift
44+
AWS_CRT_SWIFT_CI_DIR: /Users/runner/work/aws-sdk-swift/aws-sdk-swift/target/build/deps/aws-crt-swift
45+
SMITHY_SWIFT_CI_DIR: /Users/runner/work/aws-sdk-swift/aws-sdk-swift/target/build/deps/smithy-swift
4546
run: |
4647
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
4748
chmod a+x builder.pyz
4849
AWS_CRT_SWIFT_CI_DIR="${{ env.AWS_CRT_SWIFT_CI_DIR }}" AWS_SDK_SWIFT_CI_DIR="${{ env.AWS_SDK_SWIFT_CI_DIR }}" SMITHY_SWIFT_CI_DIR="${{ env.SMITHY_SWIFT_CI_DIR }}" ./builder.pyz build -p ${{ env.PACKAGE_NAME }}
4950
./gradlew -p codegen/sdk-codegen build
5051
./gradlew -p codegen/sdk-codegen stageSdks
52+
./gradlew --stop
5153
./scripts/mergeModels.sh Sources/Services
52-
AWS_SDK_RELEASE_IN_PROGRESS=1 ./scripts/generatePackageSwift.swift > Package.swift
54+
- name: Generate Package.swift
55+
./scripts/generatePackageSwift.swift > Package.swift
5356
cat Package.swift
54-
./gradlew --stop
5557
swift build --build-tests
5658
swift test --skip-build
5759
- name: Commit Changes

0 commit comments

Comments
 (0)