docker cleanups

Author: ktoso

docker/docker-compose.2004.55.yaml

@@ -11,7 +11,8 @@ services:
 
   test:
     image: swift-metrics:20.04-5.5
-    environment: []
+    environment:
+      - FORCE_TEST_DISCOVERY=--enable-test-discovery
       #- SANITIZER_ARG=--sanitize=thread
 
   shell:

docker/docker-compose.2004.56.yaml

@@ -0,0 +1,19 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-metrics:20.04-5.6
+    build:
+      args:
+        ubuntu_version: "focal"
+        swift_version: "5.6"
+
+  test:
+    image: swift-metrics:20.04-5.6∂
+    environment:
+      - FORCE_TEST_DISCOVERY=--enable-test-discovery
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: swift-metrics:20.04-5.6

docker/docker-compose.2004.57.yaml

@@ -0,0 +1,19 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-metrics:20.04-5.7
+    build:
+      args:
+        ubuntu_version: "focal"
+        swift_version: "5.7"
+
+  test:
+    image: swift-metrics:20.04-5.7
+    environment:
+      - FORCE_TEST_DISCOVERY=--enable-test-discovery
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: swift-metrics:20.04-5.7

docker/docker-compose.2004.main.yaml

@@ -11,7 +11,8 @@ services:
 
   test:
     image: swift-metrics:20.04-main
-    environment: []
+    environment:
+      - FORCE_TEST_DISCOVERY=--enable-test-discovery
       #- SANITIZER_ARG=--sanitize=thread
 
   shell:

docker/docker-compose.yaml

@@ -26,15 +26,9 @@ services:
     <<: *common
     command: /bin/bash -xcl "./scripts/soundness.sh"
 
-  docs:
-    <<: *common
-    environment:
-      - CI
-    command: /bin/bash -xcl "./scripts/generate_docs.sh"
-
   test:
     <<: *common
-    command: /bin/bash -xcl "swift test -Xswiftc -warnings-as-errors $${SANITIZER_ARG-}"
+    command: /bin/bash -xcl "swift test -Xswiftc -warnings-as-errors $${FORCE_TEST_DISCOVERY-} $${SANITIZER_ARG-}"
 
   # util
 

scripts/soundness.sh

@@ -32,7 +32,7 @@ here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 function replace_acceptable_years() {
     # this needs to replace all acceptable forms with 'YEARS'
-    sed -e 's/2018-2019/YEARS/' -e 's/2019/YEARS/' -e 's/2018-2020/YEARS/' -e 's/2021/YEARS/'
+    sed -e 's/2018-2019/YEARS/' -e 's/2019/YEARS/' -e 's/2018-2020/YEARS/' -e 's/2021/YEARS/' -e 's/2022/YEARS/'
 }
 
 printf "=> Checking linux tests... "
@@ -88,7 +88,7 @@ for language in swift-or-c bash dtrace; do
   matching_files=( -name '*' )
   case "$language" in
       swift-or-c)
-        exceptions=( -name c_nio_http_parser.c -o -name c_nio_http_parser.h -o -name cpp_magic.h -o -name Package.swift -o -name CNIOSHA1.h -o -name c_nio_sha1.c -o -name ifaddrs-android.c -o -name ifaddrs-android.h)
+        exceptions=( -name c_nio_http_parser.c -o -name c_nio_http_parser.h -o -name cpp_magic.h -o -name Package@*.swift -o -name CNIOSHA1.h -o -name c_nio_sha1.c -o -name ifaddrs-android.c -o -name ifaddrs-android.h)
         matching_files=( -name '*.swift' -o -name '*.c' -o -name '*.h' )
         cat > "$tmp" <<"EOF"
 //===----------------------------------------------------------------------===//