From 08bb1bb0143395e3ea2c2882563322ae6257cf79 Mon Sep 17 00:00:00 2001 From: Franz Busch Date: Fri, 28 Mar 2025 11:45:15 +0100 Subject: [PATCH] Fix yaml check and remove docker compose --- .yamllint.yml | 7 +++++ docker/Dockerfile | 24 ----------------- docker/docker-compose.2004.57.yaml | 22 ---------------- docker/docker-compose.2004.58.yaml | 21 --------------- docker/docker-compose.2204.main.yaml | 21 --------------- docker/docker-compose.yaml | 39 ---------------------------- 6 files changed, 7 insertions(+), 127 deletions(-) create mode 100644 .yamllint.yml delete mode 100644 docker/Dockerfile delete mode 100644 docker/docker-compose.2004.57.yaml delete mode 100644 docker/docker-compose.2004.58.yaml delete mode 100644 docker/docker-compose.2204.main.yaml delete mode 100644 docker/docker-compose.yaml diff --git a/.yamllint.yml b/.yamllint.yml new file mode 100644 index 0000000..52a1770 --- /dev/null +++ b/.yamllint.yml @@ -0,0 +1,7 @@ +extends: default + +rules: + line-length: false + document-start: false + truthy: + check-keys: false # Otherwise we get a false positive on GitHub action's `on` key diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index e592f92..0000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -ARG swift_version=5.7 -ARG ubuntu_version=focal -ARG base_image=swift:$swift_version-$ubuntu_version -FROM $base_image -# needed to do again after FROM due to docker limitation -ARG swift_version -ARG ubuntu_version - -# set as UTF-8 -RUN apt-get update && apt-get install -y locales locales-all -ENV LC_ALL en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US.UTF-8 - -# tools -RUN mkdir -p $HOME/.tools -RUN echo 'export PATH="$HOME/.tools:$PATH"' >> $HOME/.profile - -# swiftformat (until part of the toolchain) - -ARG swiftformat_version=0.51.12 -RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format -RUN cd $HOME/.tools/swift-format && swift build -c release -RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat diff --git a/docker/docker-compose.2004.57.yaml b/docker/docker-compose.2004.57.yaml deleted file mode 100644 index 19c52d8..0000000 --- a/docker/docker-compose.2004.57.yaml +++ /dev/null @@ -1,22 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-async-algorithms:20.04-5.7 - build: - args: - ubuntu_version: "focal" - swift_version: "5.7" - - build: - image: swift-async-algorithms:20.04-5.7 - - test: - image: swift-async-algorithms:20.04-5.7 - environment: [] - #- SANITIZER_ARG: "--sanitize=thread" - #- TSAN_OPTIONS: "no_huge_pages_for_shadow=0 suppressions=/code/tsan_suppressions.txt" - - shell: - image: swift-async-algorithms:20.04-5.7 diff --git a/docker/docker-compose.2004.58.yaml b/docker/docker-compose.2004.58.yaml deleted file mode 100644 index 56d83df..0000000 --- a/docker/docker-compose.2004.58.yaml +++ /dev/null @@ -1,21 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-async-algorithms:20.04-5.8 - build: - args: - base_image: "swiftlang/swift:nightly-5.8-focal" - - build: - image: swift-async-algorithms:20.04-5.8 - - test: - image: swift-async-algorithms:20.04-5.8 - environment: [] - #- SANITIZER_ARG: "--sanitize=thread" - #- TSAN_OPTIONS: "no_huge_pages_for_shadow=0 suppressions=/code/tsan_suppressions.txt" - - shell: - image: swift-async-algorithms:20.04-5.8 diff --git a/docker/docker-compose.2204.main.yaml b/docker/docker-compose.2204.main.yaml deleted file mode 100644 index f28e21d..0000000 --- a/docker/docker-compose.2204.main.yaml +++ /dev/null @@ -1,21 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-async-algorithms:22.04-main - build: - args: - base_image: "swiftlang/swift:nightly-main-jammy" - - build: - image: swift-async-algorithms:22.04-main - - test: - image: swift-async-algorithms:22.04-main - environment: [] - #- SANITIZER_ARG: "--sanitize=thread" - #- TSAN_OPTIONS: "no_huge_pages_for_shadow=0 suppressions=/code/tsan_suppressions.txt" - - shell: - image: swift-async-algorithms:22.04-main diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml deleted file mode 100644 index 8d1d9a3..0000000 --- a/docker/docker-compose.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# this file is not designed to be run directly -# instead, use the docker-compose.. files -# eg docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.2004.56.yaml run test -version: "3" - -services: - runtime-setup: - image: swift-async-algorithms:default - build: - context: . - dockerfile: Dockerfile - - common: &common - image: swift-async-algorithms:default - depends_on: [runtime-setup] - volumes: - - ~/.ssh:/root/.ssh - - ..:/code:z - working_dir: /code - - soundness: - <<: *common - command: /bin/bash -xcl "swift -version && uname -a && ./scripts/soundness.sh" - - build: - <<: *common - environment: [] - command: /bin/bash -cl "swift build" - - test: - <<: *common - depends_on: [runtime-setup] - command: /bin/bash -xcl "swift $${SWIFT_TEST_VERB-test} $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-}" - - # util - - shell: - <<: *common - entrypoint: /bin/bash