Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,18 @@ runs:
distribution: "corretto"
java-version: "17"

- name: Install smithy-dafny-codegen dependencies locally
shell: bash
run: |
make -C mpl/smithy-dafny mvn_local_deploy_polymorph_dependencies
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Install smithy-dafny-codegen dependencies locally (with retry)
uses: nick-fields/retry@v3
with:
timeout_minutes: 15
max_attempts: 3
retry_on: error
shell: bash
command: |
make -C mpl/smithy-dafny mvn_local_deploy_polymorph_dependencies

- name: Setup Python, black, and docformatter for code formatting
uses: actions/setup-python@v6
Expand All @@ -41,7 +49,12 @@ runs:
go install golang.org/x/tools/cmd/goimports@v0.36.0

# Without this the if-dafny-at-least command includes "Downloading ..." output
- name: Arbitrary makefile target to force downloading Gradle
shell: bash
run: |
make -C mpl/StandardLibrary setup_net
- name: Arbitrary makefile target to force downloading Gradle (with retry)
uses: nick-fields/retry@v3
with:
timeout_minutes: 10
max_attempts: 3
retry_on: error
shell: bash
command: |
make -C mpl/StandardLibrary setup_net
2 changes: 1 addition & 1 deletion .github/workflows/dafny_interop_test_vector_net.yml
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ jobs:
zip -qq net41.zip -r .

- name: Upload Zip File
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
if: matrix.os != 'windows-latest'
with:
name: ${{matrix.os}}_mpl-${{inputs.mpl-dafny}}_esdk-${{inputs.esdk-dafny}}_vectors
Expand Down
60 changes: 36 additions & 24 deletions .github/workflows/library_interop_keyring_test_vectors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,31 +83,43 @@ jobs:
path: ./${{ matrix.library }}/aws-encryption-sdk-c/aws-sdk-cpp
submodules: recursive

- name: Build and install aws-sdk-cpp
- name: Build and install aws-sdk-cpp (with retry)
if: matrix.language == 'c' && matrix.os != 'ubuntu-22.04'
working-directory: ./${{ matrix.library }}/aws-encryption-sdk-c
run: |
# remove the following line once aws-sdk-cpp fixes linux-shared/SimpleUDP.cpp
perl -i -p -e 's/"-Werror"//' aws-sdk-cpp/cmake/compiler_settings.cmake
mkdir -p aws-encryption-sdk-c/build-aws-sdk-cpp || true
mkdir -p install || true
cd build-aws-sdk-cpp
cmake -G Xcode -DTARGET_ARCH="APPLE" -DBUILD_SHARED_LIBS=ON -DBUILD_ONLY="kms" -DENABLE_UNITY_BUILD=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install -DCMAKE_PREFIX_PATH=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install ../aws-sdk-cpp
xcodebuild -target ALL_BUILD
xcodebuild -target install

- name: Build and install aws-sdk-cpp
uses: nick-fields/retry@v3
with:
timeout_minutes: 30
max_attempts: 3
retry_on: error
shell: bash
command: |
cd ./${{ matrix.library }}/aws-encryption-sdk-c
# remove the following line once aws-sdk-cpp fixes linux-shared/SimpleUDP.cpp
perl -i -p -e 's/"-Werror"//' aws-sdk-cpp/cmake/compiler_settings.cmake
mkdir -p aws-encryption-sdk-c/build-aws-sdk-cpp || true
mkdir -p install || true
cd build-aws-sdk-cpp
cmake -G Xcode -DTARGET_ARCH="APPLE" -DBUILD_SHARED_LIBS=ON -DBUILD_ONLY="kms" -DENABLE_UNITY_BUILD=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install -DCMAKE_PREFIX_PATH=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install ../aws-sdk-cpp
xcodebuild -target ALL_BUILD
xcodebuild -target install

- name: Build and install aws-sdk-cpp (with retry)
if: matrix.os == 'ubuntu-22.04' && matrix.language == 'c'
working-directory: ./${{ matrix.library }}/aws-encryption-sdk-c
run: |
# remove the following line once aws-sdk-cpp fixes linux-shared/SimpleUDP.cpp
perl -i -p -e 's/"-Werror"//' aws-sdk-cpp/cmake/compiler_settings.cmake
mkdir -p build-aws-sdk-cpp || true
mkdir -p install || true
cd build-aws-sdk-cpp
cmake -DBUILD_SHARED_LIBS=ON -DBUILD_ONLY="kms" -DENABLE_UNITY_BUILD=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install -DCMAKE_PREFIX_PATH=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install ../aws-sdk-cpp
make
make install
uses: nick-fields/retry@v3
with:
timeout_minutes: 30
max_attempts: 3
retry_on: error
shell: bash
command: |
cd ./${{ matrix.library }}/aws-encryption-sdk-c
# remove the following line once aws-sdk-cpp fixes linux-shared/SimpleUDP.cpp
perl -i -p -e 's/"-Werror"//' aws-sdk-cpp/cmake/compiler_settings.cmake
mkdir -p build-aws-sdk-cpp || true
mkdir -p install || true
cd build-aws-sdk-cpp
cmake -DBUILD_SHARED_LIBS=ON -DBUILD_ONLY="kms" -DENABLE_UNITY_BUILD=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install -DCMAKE_PREFIX_PATH=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install ../aws-sdk-cpp
make
make install

- name: Build C-ESDK
if: matrix.language == 'c' && matrix.os != 'ubuntu-22.04'
Expand Down Expand Up @@ -285,7 +297,7 @@ jobs:
run: make test_encrypt_vectors_c_unix

- name: Upload Keyring Encrypt Manifest and keys.json files
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: ${{matrix.os}}_vector_artifact_${{matrix.language}}_${{github.sha}}
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/library_interop_mkp_test_vectors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ jobs:
make test_encrypt_vectors_${{ matrix.language }}_legacy_format

- name: Upload Encrypt Manifest and keys.json files
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: ${{matrix.os}}_vector_artifact_${{matrix.language}}_legacy_format_${{github.sha}}
path: |
Expand Down Expand Up @@ -638,7 +638,7 @@ jobs:
npx -y @aws-crypto/integration-node encrypt -m encrypt-manifest.json -k keys.json -d decrypt-manifest-js.zip -C

- name: Upload Encrypt Manifest and keys.json files
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: ${{matrix.os}}_vector_artifact_javascript_legacy_format_${{github.sha}}
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/library_interop_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ jobs:
zip -qq net41.zip -r .

- name: Upload Zip File
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
if: matrix.os != 'windows-latest'
with:
name: ${{matrix.os}}_vector_artifact
Expand Down
Loading