diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 3e6f33a2..a41444ce 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -27,8 +27,6 @@ services: soundness: <<: *common command: /bin/bash -xcl "swift -version && uname -a && ./scripts/soundness.sh" - environment: - SWIFT_OPENAPI_GENERATOR_REPO_URL: file:///code test: <<: *common @@ -38,3 +36,14 @@ services: <<: *common entrypoint: /bin/bash + integration-test: + <<: *common + command: /bin/bash -xcl "swift -version && uname -a && bash ./scripts/run-integration-test.sh" + environment: + SWIFT_OPENAPI_GENERATOR_REPO_URL: file:///code + + docc-test: + <<: *common + command: /bin/bash -xcl "swift -version && uname -a && bash ./scripts/check-for-docc-warnings.sh" + environment: + DOCC_TARGET: swift-openapi-generator diff --git a/scripts/soundness.sh b/scripts/soundness.sh index 06c63e18..f8ae7050 100755 --- a/scripts/soundness.sh +++ b/scripts/soundness.sh @@ -20,15 +20,12 @@ fatal() { error "$@"; exit 1; } CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" NUM_CHECKS_FAILED=0 -export DOCC_TARGET=swift-openapi-generator SCRIPT_PATHS=( "${CURRENT_SCRIPT_DIR}/check-for-broken-symlinks.sh" "${CURRENT_SCRIPT_DIR}/check-for-unacceptable-language.sh" "${CURRENT_SCRIPT_DIR}/check-license-headers.sh" "${CURRENT_SCRIPT_DIR}/run-swift-format.sh" - "${CURRENT_SCRIPT_DIR}/check-for-docc-warnings.sh" - "${CURRENT_SCRIPT_DIR}/run-integration-test.sh" ) for SCRIPT_PATH in "${SCRIPT_PATHS[@]}"; do