Skip to content

Commit

Permalink
remove benchmarks pipeline
Browse files Browse the repository at this point in the history
Benchmarks are currently broken, the code doesn't handle various memcached
response codes and flag characters which are encountered in the
benchmarks
  • Loading branch information
rnro committed Nov 12, 2024
1 parent 4f3452b commit ce59482
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 168 deletions.
86 changes: 0 additions & 86 deletions .github/workflows/benchmarks.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,3 @@ jobs:
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error"
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"

benchmarks:
name: Benchmarks
uses: apple/swift-nio/.github/workflows/benchmarks.yml@main
with:
benchmark_package_path: "Benchmarks"
7 changes: 0 additions & 7 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@ jobs:
linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error"
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"

benchmarks:
name: Benchmarks
uses: ./.github/workflows/benchmarks.yml
with:
benchmark_package_path: "Benchmarks"
swift_package_arguments: "--disable-sandbox"

cxx-interop:
name: Cxx interop
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
4 changes: 2 additions & 2 deletions dev/update-benchmark-thresholds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ set -o pipefail
here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
target_repo=${2-"$here/.."}

for f in 57 58 59 510 -nightly; do
for f in 59 510 -nightly; do
echo "swift$f"

docker_file=$(if [[ "$f" == "-nightly" ]]; then f=main; fi && ls "$target_repo/docker/docker-compose."*"$f"*".yaml")

docker-compose -f docker/docker-compose.yaml -f $docker_file run update-benchmark-baseline
docker-compose -f docker/docker-compose.yaml -f "$docker_file" run update-benchmark-baseline
done
10 changes: 2 additions & 8 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG swift_version=5.7
ARG swift_version=5.9
ARG ubuntu_version=jammy
ARG base_image=swift:$swift_version-$ubuntu_version
FROM $base_image
Expand All @@ -16,11 +16,5 @@ ENV LANGUAGE en_US.UTF-8
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.8
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

# install jemalloc for running allocation benchmarks
RUN apt-get update & apt-get install -y libjemalloc-dev
RUN apt-get update & apt-get install -y libjemalloc-dev
3 changes: 1 addition & 2 deletions docker/docker-compose.2204.510.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ services:

shell:
image: swift-memcache-gsoc:22.04-5.10

update-benchmark-baseline:
image: swift-memcache-gsoc:22.04-5.10
environment:
- SWIFT_VERSION=5.10

24 changes: 0 additions & 24 deletions docker/docker-compose.2204.57.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions docker/docker-compose.2204.58.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion docker/docker-compose.2204.main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ services:
update-benchmark-baseline:
image: swift-memcache-gsoc:22.04-main
environment:
- SWIFT_VERSION=main
- SWIFT_VERSION=main
14 changes: 7 additions & 7 deletions docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ version: "3.9"
services:
# Swift on Server CI
# e.g. docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.2204.57.yaml run test

memcached:
image: memcached:latest
networks:
- memcached
ports:
- 11211
- 11211

Check failure on line 12 in docker/docker-compose.yaml

View workflow job for this annotation

GitHub Actions / Soundness / YAML lint check

12:8 [indentation] wrong indentation: expected 6 but found 7

Check failure on line 13 in docker/docker-compose.yaml

View workflow job for this annotation

GitHub Actions / Soundness / YAML lint check

13:1 [trailing-spaces] trailing spaces
runtime-setup:
image: swift-memcache-gsoc:default
build:
Expand All @@ -32,8 +32,8 @@ services:
test:
<<: *common
depends_on:
- runtime-setup
- memcached
- runtime-setup
- memcached
command: /bin/bash -xcl "swift $${SWIFT_TEST_VERB-test} $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-} && cd Benchmarks && swift package --disable-sandbox benchmark baseline check --check-absolute-path Thresholds/$${SWIFT_VERSION-}/"
networks:
- memcached
Expand All @@ -47,8 +47,8 @@ services:
update-benchmark-baseline:
<<: *common
depends_on:
- runtime-setup
- memcached
- runtime-setup
- memcached
command: /bin/bash -xcl "cd Benchmarks && swift package --disable-sandbox --scratch-path .build/$${SWIFT_VERSION-}/ --allow-writing-to-package-directory benchmark --format metricP90AbsoluteThresholds --path Thresholds/$${SWIFT_VERSION-}/"

# dedicated network
Expand Down

0 comments on commit ce59482

Please sign in to comment.