diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 51a9d4c9066..ad45ed22f93 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -128,7 +128,7 @@ jobs: - amazonlinux2 version: - "5.9" - - "5.10" + - "6.0" env: ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true steps: diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 233e7c8c646..facb2c1243d 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -137,7 +137,7 @@ jobs: - amazonlinux2 version: - "5.9" - - "5.10" + - "6.0" env: ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true steps: diff --git a/.github/workflows/model-integration.yml b/.github/workflows/model-integration.yml deleted file mode 100644 index 313939b4977..00000000000 --- a/.github/workflows/model-integration.yml +++ /dev/null @@ -1,85 +0,0 @@ -name: Model Integration - -# The purpose of this workflow is to detect breaking model changes within a -# day of when they are published. -# -# Pulls latest model changes from aws/aws-models -# Code-generates them -# Builds and tests SDK -# -# Runs nightly at 0700 UTC, or on manual dispatch. -# Uses main branch for aws-sdk-swift & smithy-swift, -# or selected branch if manually triggered. - -on: - workflow_dispatch: - schedule: - - cron: '0 7 * * *' - -jobs: - model-integration: - runs-on: ubuntu-latest - container: swift:5.10-jammy - env: - AWS_SWIFT_SDK_USE_LOCAL_DEPS: 1 - steps: - - name: Checkout aws-sdk-swift - uses: actions/checkout@v3 - - name: Select smithy-swift branch - run: | - ORIGINAL_REPO_HEAD_REF="${GITHUB_HEAD_REF:-${GITHUB_REF_NAME:-main}}" \ - DEPENDENCY_REPO_URL="https://github.com/smithy-lang/smithy-swift.git" \ - ./scripts/ci_steps/select_dependency_branch.sh - - name: Checkout smithy-swift - uses: actions/checkout@v3 - with: - repository: smithy-lang/smithy-swift - ref: ${{ env.DEPENDENCY_REPO_SHA }} - path: smithy-swift - - name: Move smithy-swift into place - run: mv smithy-swift .. - - name: Setup Java - uses: actions/setup-java@v3 - with: - distribution: corretto - java-version: 17 - - name: Install OpenSSL & jq - run: apt-get -q update && apt-get -q install -y libssl-dev jq - - name: Tools Versions - run: ./scripts/ci_steps/log_tool_versions.sh - - name: Update models from aws/aws-models repo - env: - UPDATE_MODELS_GIT_URL: https://${{ secrets.GH_PAT_AWS_MODELS }}@github.com/aws/aws-models.git - run: | - cd codegen/sdk-codegen/scripts - ./updatemodels.sh - cd ../../.. - - name: Delete previous generated code - run: | - rm -rf Sources/Services/* - rm -rf Tests/Services/* - - name: Generate Models - run: | - ./gradlew -p codegen/sdk-codegen build - ./gradlew -p codegen/sdk-codegen stageSdks - ./gradlew --stop - - name: Regenerate Package.swift - run: | - cd AWSSDKSwiftCLI - swift run AWSSDKSwiftCLI generate-package-manifest .. - cd .. - echo "Manifest contents:" - cat Package.swift - - name: Create dummy AWS credentials - run: | - mkdir -p ~/.aws - echo "[default]" > ~/.aws/config - echo "region=us-west-2" >> ~/.aws/config - echo "[default]" > ~/.aws/credentials - echo "aws_access_key_id = test-key-id" >> ~/.aws/credentials - echo "aws_secret_access_key = test-secret-access-key" >> ~/.aws/credentials - - name: Build and Test SDK - run: | - cd AWSSDKSwiftCLI - swift run AWSSDKSwiftCLI test-aws-sdk .. --batches 10 - cd ..