From 70d062b0f438f4d86b91e3bb0ca797880eadeb9a Mon Sep 17 00:00:00 2001 From: Si Beaumont Date: Thu, 8 Jun 2023 23:00:07 +0100 Subject: [PATCH] Run run-integration-test.sh as part of soundness.sh Signed-off-by: Si Beaumont --- docker/Dockerfile | 5 ++++- docker/docker-compose.yaml | 2 ++ scripts/soundness.sh | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 4b7014a7..33f860d9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -20,4 +20,7 @@ RUN echo 'export PATH="$HOME/.tools:$PATH"' >> $HOME/.profile ARG swiftformat_version=508.0.0 RUN git clone --branch $swiftformat_version --depth 1 https://github.com/apple/swift-format $HOME/.tools/swift-format-source RUN cd $HOME/.tools/swift-format-source && swift build -c release -RUN ln -s $HOME/.tools/swift-format-source/.build/release/swift-format $HOME/.tools/swift-format \ No newline at end of file +RUN ln -s $HOME/.tools/swift-format-source/.build/release/swift-format $HOME/.tools/swift-format + +# jq +RUN apt-get install -y jq diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index bb42b187..3e6f33a2 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -27,6 +27,8 @@ services: soundness: <<: *common command: /bin/bash -xcl "swift -version && uname -a && ./scripts/soundness.sh" + environment: + SWIFT_OPENAPI_GENERATOR_REPO_URL: file:///code test: <<: *common diff --git a/scripts/soundness.sh b/scripts/soundness.sh index 9d6009bc..06c63e18 100755 --- a/scripts/soundness.sh +++ b/scripts/soundness.sh @@ -28,6 +28,7 @@ SCRIPT_PATHS=( "${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