Skip to content

Commit 251182d

Browse files
committed
remove benchmarks workflow
Benchmarks are non-functional. The product code cannot handle various result codes and flags from memcached
1 parent 135a563 commit 251182d

10 files changed

+13
-168
lines changed

.github/workflows/benchmarks.yml

-86
This file was deleted.

.github/workflows/main.yml

-6
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,3 @@ jobs:
1616
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
1717
linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error"
1818
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
19-
20-
benchmarks:
21-
name: Benchmarks
22-
uses: apple/swift-nio/.github/workflows/benchmarks.yml@main
23-
with:
24-
benchmark_package_path: "Benchmarks"

.github/workflows/pull_request.yml

-7
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ jobs:
2121
linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error"
2222
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
2323

24-
benchmarks:
25-
name: Benchmarks
26-
uses: ./.github/workflows/benchmarks.yml
27-
with:
28-
benchmark_package_path: "Benchmarks"
29-
swift_package_arguments: "--disable-sandbox"
30-
3124
cxx-interop:
3225
name: Cxx interop
3326
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main

dev/update-benchmark-thresholds.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ set -o pipefail
4545
here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4646
target_repo=${2-"$here/.."}
4747

48-
for f in 57 58 59 510 -nightly; do
48+
for f in 59 510 -nightly; do
4949
echo "swift$f"
5050

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

53-
docker-compose -f docker/docker-compose.yaml -f $docker_file run update-benchmark-baseline
53+
docker-compose -f docker/docker-compose.yaml -f "$docker_file" run update-benchmark-baseline
5454
done

docker/Dockerfile

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG swift_version=5.7
1+
ARG swift_version=5.9
22
ARG ubuntu_version=jammy
33
ARG base_image=swift:$swift_version-$ubuntu_version
44
FROM $base_image
@@ -16,11 +16,5 @@ ENV LANGUAGE en_US.UTF-8
1616
RUN mkdir -p $HOME/.tools
1717
RUN echo 'export PATH="$HOME/.tools:$PATH"' >> $HOME/.profile
1818

19-
# swiftformat (until part of the toolchain)
20-
ARG swiftformat_version=0.51.8
21-
RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format
22-
RUN cd $HOME/.tools/swift-format && swift build -c release
23-
RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat
24-
2519
# install jemalloc for running allocation benchmarks
26-
RUN apt-get update & apt-get install -y libjemalloc-dev
20+
RUN apt-get update & apt-get install -y libjemalloc-dev

docker/docker-compose.2204.510.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ services:
1717

1818
shell:
1919
image: swift-memcache-gsoc:22.04-5.10
20-
20+
2121
update-benchmark-baseline:
2222
image: swift-memcache-gsoc:22.04-5.10
2323
environment:
2424
- SWIFT_VERSION=5.10
25-

docker/docker-compose.2204.57.yaml

-24
This file was deleted.

docker/docker-compose.2204.58.yaml

-25
This file was deleted.

docker/docker-compose.2204.main.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ services:
2121
update-benchmark-baseline:
2222
image: swift-memcache-gsoc:22.04-main
2323
environment:
24-
- SWIFT_VERSION=main
24+
- SWIFT_VERSION=main

docker/docker-compose.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ version: "3.9"
33
services:
44
# Swift on Server CI
55
# e.g. docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.2204.57.yaml run test
6-
6+
77
memcached:
88
image: memcached:latest
99
networks:
1010
- memcached
1111
ports:
12-
- 11211
13-
12+
- 11211
13+
1414
runtime-setup:
1515
image: swift-memcache-gsoc:default
1616
build:
@@ -32,8 +32,8 @@ services:
3232
test:
3333
<<: *common
3434
depends_on:
35-
- runtime-setup
36-
- memcached
35+
- runtime-setup
36+
- memcached
3737
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-}/"
3838
networks:
3939
- memcached
@@ -47,8 +47,8 @@ services:
4747
update-benchmark-baseline:
4848
<<: *common
4949
depends_on:
50-
- runtime-setup
51-
- memcached
50+
- runtime-setup
51+
- memcached
5252
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-}/"
5353

5454
# dedicated network

0 commit comments

Comments
 (0)